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

Browse Source

* commit '7f5a3d10f860ee1962c4bb81fa5a552cc5fedc3e':

...

This commit is contained in:

The Android Open Source Project

2012-12-12 07:36:21 -08:00

committed by Android Git Automerger

parent 1d6bf8d46b 7f5a3d10f8

commit d870df94b2

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