tree c6f827a58b7a3662745289557272eb6f55ae7039
parent a7fc89ae6184eb8b92fd229e45ffa0bbe7bbf1da
parent 62ee468e7b1239c9882870a49b91aa98d59e99d0
parent 23234247e025176fc03cd33c12845d489f4d3a43
author The Android Open Source Project <initial-contribution@android.com> 1349887486 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887486 -0700

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

Change-Id: Ic06ba79213c8ce2c41c8282a333456fd8304636b