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

Browse Source

* commit '5b734503a42beab7cc8d74d4fff20996cb6b5cb2':

...

This commit is contained in:

The Android Open Source Project

2013-07-08 15:52:24 -07:00

committed by Android Git Automerger

parent 0927e678c1 5b734503a4

commit c44981dca2

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

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

Diff Content Not Available