am 15476e83: (-s ours) Reconcile with jb-mr1.1-release - do not merge

Browse Source

# By The Android Automerger
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '15476e83b7f711ad9a4f5d9e33efe4e194f94df6':
  JDQ36B

...

This commit is contained in:

The Android Open Source Project 2013-02-06 09:13:59 -08:00 committed by Android Git Automerger

parent 1151ef4f85 15476e83b7

commit 06a9e61da4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available