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

Browse Source

* commit 'e57594a6934a912ab7b1bd0b8bdaff187ae25ca3':
  JDP80B

...

This commit is contained in:

The Android Open Source Project 2012-12-19 14:35:35 -08:00 committed by Android Git Automerger

parent 536a7b24a3 e57594a693

commit b4f5a32e49

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