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 '680f5e14d41eb1bc4c5c4a26e607d821b446758f':

main

The Android Open Source Project 2013-10-03 14:55:27 -07:00 committed by Android Git Automerger

parent dbf6adca3d 680f5e14d4

commit 7ef9b61e12

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