tree 33198e857b2ea238cc749208df0a5d4e66be76ed
parent c9d0b4e70d06e1feb19b2ac2afd74e4a41ce07bb
parent f78c2c6bf95e22c5efec1712a9f097bea53e90c9
author The Android Open Source Project <initial-contribution@android.com> 1372201854 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1372201854 -0700

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

Change-Id: Ia457329098c5b55c16b4a0a34b5a0076fcef67cc