am 5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '5871434ed6cb00895bba1bc253dcbfc49c453041':

...

This commit is contained in:

The Android Open Source Project

2013-06-03 14:07:19 -07:00

committed by Android Git Automerger

parent c930c4e1f0 5871434ed6

commit e382d4da24

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