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

Browse Source

* commit 'b2bc33315824ee880b319a2eb69018dc44d1026e':

...

This commit is contained in:

The Android Open Source Project

2013-07-11 08:08:06 -07:00

committed by Android Git Automerger

parent e3f9071e0d b2bc333158

commit c6f681d131

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