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

Browse Source

* commit '7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':

...

This commit is contained in:

The Android Open Source Project 2012-12-07 07:56:46 -08:00 committed by Android Git Automerger

parent b5fe96b813 7bd5a76e2e

commit f3a736e8f0

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