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

Browse Source

* commit '7e266298b93bf60b193007d2e5238daef1eaaf8c':

...

This commit is contained in:

The Android Open Source Project

2012-08-15 08:32:23 -07:00

committed by Android Git Automerger

parent 280df74a4e 7e266298b9

commit 786ade6ddf

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