tree 4f98e2019309c68a6235d5f9830d23ad61eef029
parent f68fcec168d7f2126b8d774628c4368f56dd6b76
parent 8359c2138a4e6bad5340cc3d17160aa035f185b4
author The Android Open Source Project <initial-contribution@android.com> 1344284941 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344284941 -0700

am 8359c213: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8359c2138a4e6bad5340cc3d17160aa035f185b4':