tree 48c97ced312186f0a073e5014f33b3ccc286ab21
parent bceb5c65f42058c13dde181e27280c8ad7155890
parent ddbc7a2996194fe834a78bf1f8178c3b16df8c66
author The Android Open Source Project <initial-contribution@android.com> 1373556182 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1373556182 -0700

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

Change-Id: I6d20c6a1a715d268e014dca7419ddaee12d4cbd9