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

Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
This commit is contained in:
The Android Open Source Project 2013-07-11 08:22:27 -07:00
commit d8d0c17e22

Diff content is not available