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

Browse Source

# Via The Android Automerger (2) and The Android Open Source Project (1)
* commit '4b71a472c0f254606e93b8f9f86f7df0e6dba522':

...

This commit is contained in:

The Android Open Source Project

2013-02-08 15:45:50 -08:00

committed by Android Git Automerger

parent 97dcc20e6d 4b71a472c0

commit 970b8b3fa9

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