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

* commit '98afd4f919beff33f0cdb8d7adb4115dca6e9a07':
main
The Android Open Source Project 2013-09-26 07:08:58 -07:00 committed by Android Git Automerger
commit 24bf247553

Diff Content Not Available