am 4d5d5107: (-s ours) Reconcile with jb-mr1-release

Browse Source

* commit '4d5d510713ba79b044b0d62434e6067b2fb5fd01':

...

This commit is contained in:

The Android Open Source Project

2012-07-30 15:16:42 -07:00

committed by Android Git Automerger

parent abbcdb75aa 4d5d510713

commit 53f36d0d53

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