tree 7b021b0222b98c0cdc2c7d74e8442921fbf3fcae
parent aa4010592c14b4f163fe31e20a3bc359174c690c
parent 75572338db212bca2c9f0a63fa1f943a5f0cdb5f
author The Android Open Source Project <initial-contribution@android.com> 1346947823 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346947823 -0700

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

* commit '75572338db212bca2c9f0a63fa1f943a5f0cdb5f':