am 31b161ce: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

Browse source

* commit '31b161cedce884cb7a1426f810d4e1cba9d33f46':
  "JSR72"

...

This commit is contained in:

The Android Open Source Project 2013-06-11 15:37:02 -07:00 committed by Android Git Automerger

parent 4297ce7d0e 31b161cedc

commit cb066089c5

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 is not available