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

Change-Id: Ifa59e8763d2dcf0dde8ce1eac004d9b1bd9f0806
This commit is contained in:
The Android Open Source Project 2013-06-16 07:43:46 -07:00
commit e2ea2d281a

Diff content is not available