Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD

This commit is contained in:
The Android Automerger 2013-06-24 14:34:42 -07:00
commit 0823a134fe

Diff content is not available