Reconcile with jb-mr1-release - do not merge

Browse Source

Change-Id: Id59555adc024005fc53103e2006e987e72283811

...

This commit is contained in:

The Android Open Source Project

2012-08-21 16:07:03 -07:00

parent 5d8378c0ba 65586bf0b4

commit e696e53483

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