am 16e52e06: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse source

* commit '16e52e065457fa480e0b684500bc1023ad40bc36':

...

This commit is contained in:

The Android Open Source Project 2012-10-31 09:22:33 -07:00 committed by Android Git Automerger

parent f0af7289cb 16e52e0654

commit 40b45d7a94

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 is not available