am 838a0997: am 32363a88: am 050cb0b5: (-s ours) am 7ef9b61e: (-s ours) am 680f5e14: am 24bf2475: (-s ours) am 98afd4f9: (-s ours) am f0bdb131: (-s ours) am 96c46273: (-s ours) am 2f387da0: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Browse Source

* commit '838a0997f4f08f6a38101d1afc73456ddbdfcce2':

main

The Android Open Source Project 2013-10-09 19:59:23 -07:00 committed by Android Git Automerger

parent 1322e6fb71 838a0997f4

commit b95153085c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available