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

Browse Source

* commit 'f05e2d25372a47f5ff3b2d0c122d5ca8c3786238':

...

This commit is contained in:

The Android Open Source Project

2013-06-21 11:58:23 -07:00

committed by Android Git Automerger

parent 64d592129e f05e2d2537

commit cdd398b03a

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