tree 5fcb94764c3e99acdc2f28f945a400e1d4660af8
parent c36184a884d817bec9d9eb1e89bdbedea329ff95
parent 08c0e3c6716d322c5237efdf3b941b7decbf175d
parent 3a28950e70b47bcba2c4070c73c6ce765e55c575
author The Android Open Source Project <initial-contribution@android.com> 1352233107 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233107 -0800

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

Change-Id: Ia95ceb234c77dafcedb79274226f4bd279c63c79