am 3401c2e9: (-s ours) Reconcile with jb-mr0-release - do not merge

Browse Source

* commit '3401c2e9e1343c964eb9495cbf8568172c14ac82':

...

This commit is contained in:

The Android Open Source Project

2012-08-10 12:36:46 -07:00

committed by Android Git Automerger

parent 68b3f065b6 3401c2e9e1

commit c47d63d103

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