tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 281bcdb98db1ccd14e0e175f193af927de3d528d
parent 115b146cc2dc4b4f9d43b4cd761727d233fc297c
author The Android Open Source Project <initial-contribution@android.com> 1343429135 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429135 -0700

am 115b146c: Reconcile with jb-mr0-release jb-release

* commit '115b146cc2dc4b4f9d43b4cd761727d233fc297c':