Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
This commit is contained in:
The Android Open Source Project 2013-07-12 14:52:07 -07:00
commit 29b708aac7

Diff Content Not Available