tree 949deb9a50bab5bc45e16e2fde02d98ca3206118
parent a0d91295f02463fa0b4dc0252066ea5d99661142
parent 63ebe6d1821288d6db104fae977f96105cdf0e14
parent 754ddd382e690edbc5818ddfc004898eedf0c555
author The Android Open Source Project <initial-contribution@android.com> 1354030419 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354030419 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Id21c5cc3e276166c24009244a452f268fd64571e