tree 59f2b0c78237790b6aa4d070610020eca8ab6f18
parent 9ac4be47317acb19a4077de3723118d879374018
parent 20d28cb2dc069a17af843ce666420fc3702973e0
author The Android Open Source Project <initial-contribution@android.com> 1368708499 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368708499 -0700

am 20d28cb2: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '20d28cb2dc069a17af843ce666420fc3702973e0':