am 694b033a: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '694b033a0da0774a1a38e253cad536e4b1f897c2':

...

This commit is contained in:

The Android Open Source Project 2012-10-09 07:32:14 -07:00 committed by Android Git Automerger

parent 9dc7c7f242 694b033a0d

commit 99760d222c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available