tree ae5562bdf384fb9ba31be9b699ebcaabbe840db2
parent 7d04c495c5ec79820c7e4bd245194e5a385e184a
parent 2d0279c72706c559f75c07622158f04c09fd90f2
author The Android Open Source Project <initial-contribution@android.com> 1372201902 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1372201902 -0700

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

Change-Id: Idb5a744d6c6b32af8a23f2e891e5d680a78877cc