tree a2305b42a9986968a9be6feb646cc57a7e075375
parent b441a2b930b5a85ea0189fbb99618823bf560037
parent 6647bf7285defdd4d5a51677d63d5ec2e722a104
author The Android Open Source Project <initial-contribution@android.com> 1374505165 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1374505165 -0700

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

Change-Id: I686cdf493c592d52eb2718fa4e42f22b902dd84c