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

Browse Source

* commit '42dc6df115a0177f5459fecdf0236c73b1e2bdbe':

...

This commit is contained in:

The Android Open Source Project

2013-06-25 17:02:28 -07:00

committed by Android Git Automerger

parent d3b689984f 42dc6df115

commit ad0b03a765

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