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

Browse Source

* commit '6045fb06c5c8304a1ac9f3388d17a6009794e7d0':

...

This commit is contained in:

The Android Open Source Project

2012-09-24 10:13:04 -07:00

committed by Android Git Automerger

parent 90bbdd2e1b 6045fb06c5

commit 75c9244069

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