tree 39fe6bd6d01054e9923e1a167eb826b3f564e387
parent 0eefffd8fc8abfbe694814fcec397aeac3f545b8
parent 1b88b416440786a09519d0b94884149d46ca4438
parent fc99165001048eac94aefbf29bcae5071493d484
author The Android Open Source Project <initial-contribution@android.com> 1372689776 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1372689776 -0700

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

Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf