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

Browse Source

* commit '37dc9a20f045436ef9ff8a15f70eda746f411ab4':
  JDP67

...

This commit is contained in:

The Android Open Source Project 2012-12-06 10:47:52 -08:00 committed by Android Git Automerger

parent c88dea4ebe 37dc9a20f0

commit b8d6078197

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