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

Browse Source

* commit 'ca650c5c89d29c0468be5b8fab97fc91a0e18ce5':

...

This commit is contained in:

The Android Open Source Project

2013-07-01 07:44:21 -07:00

committed by Android Git Automerger

parent 822136e2c0 ca650c5c89

commit 3c83ae9dd7

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