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

Browse Source

* commit '349ef841374a0dc016883e7bb7260b988b6a0c7c':

...

This commit is contained in:

The Android Open Source Project

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

committed by Android Git Automerger

parent 8202f732bf 349ef84137

commit 397ae6e5d0

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