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

Browse Source

* commit 'ff2b0d7f79283665ad3d1fee8a96b3455be7f91d':

...

This commit is contained in:

The Android Open Source Project

2013-07-08 15:48:50 -07:00

committed by Android Git Automerger

parent c541fcbf60 ff2b0d7f79

commit f9ee312b4e

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