am 65752b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '65752b2b516204d890e59dbc395608d7dec0cff5':
This commit is contained in:
The Android Open Source Project 2013-07-15 09:37:54 -07:00 committed by Android Git Automerger
commit 4ca0c72f2b

Diff Content Not Available