tree 6653828b62901f584aa8685501859eb53447005e
parent 3900b73649f5bc466269811f7fd97a78029236f6
parent 17afc657d1cb0f9bde97288d946313e20d0b6a2a
parent 148ec084c4c40e7c3b833c6f65cbee6c703593fc
author The Android Open Source Project <initial-contribution@android.com> 1352232971 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352232971 -0800

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

Change-Id: I8e6b252cb0d4b89351a9fbf83ac46fe94c11e886