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

Browse Source

* commit 'e696e53483068dd6bd0aa0ccde42bc1a1b75d336':

...

This commit is contained in:

The Android Open Source Project

2012-08-21 16:09:57 -07:00

committed by Android Git Automerger

parent 8f97db22a9 e696e53483

commit 7e0bcb084d

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