am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Browse Source

* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':

...

This commit is contained in:

The Android Open Source Project

2013-12-05 19:21:35 +00:00

committed by Android Git Automerger

parent bf3d3f8fd0 8c1845a6d6

commit c3835eae23

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