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

Browse Source

* commit 'f2d9e68c238d754d00fa846b4d4c6737a24595fc':

...

This commit is contained in:

The Android Open Source Project

2013-07-15 09:37:51 -07:00

committed by Android Git Automerger

parent 5c2075037d f2d9e68c23

commit 09fb2a55d9

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