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

Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774
This commit is contained in:
The Android Open Source Project 2013-07-16 11:19:23 -07:00
commit 4c7db15456

Diff content is not available