am 3ee91251: (-s ours) Reconcile with jb-mr1-release - do not merge

Browse Source

* commit '3ee91251be45830522c6a0aa8d2c145b08b5f327':
  JOP03
  JOP02B

...

This commit is contained in:

The Android Open Source Project 2012-10-03 07:34:39 -07:00 committed by Android Git Automerger

parent 75277754d2 3ee91251be

commit 71eef22e4a

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