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

Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec
This commit is contained in:
The Android Open Source Project 2013-07-15 09:32:49 -07:00
commit 8fa2968a90

Diff content is not available