am 1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge

Browse Source

* commit '1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':

...

This commit is contained in:

The Android Open Source Project

2012-12-05 13:01:02 -08:00

committed by Android Git Automerger

parent a87df26fc2 1aa371fcaf

commit 96e08d1961

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

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

Diff Content Not Available