am 8bebe981: (-s ours) am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Browse Source

* commit '8bebe981e5a347a6f99d6916f689fcaf9cd29c8f':

...

This commit is contained in:

The Android Open Source Project

2012-11-06 12:34:00 -08:00

committed by Android Git Automerger

parent 1f1d0235fe 8bebe981e5

commit 0572d72cf7

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