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

* commit '24bf247553eb5358249006350fd577d12ae3a8e5':
This commit is contained in:
The Android Open Source Project 2013-10-03 11:41:44 -07:00 committed by Android Git Automerger
commit 680f5e14d4

Diff content is not available