tree 9cd528aeb893f4fa1505d5cfa4863ce936a160e2
parent dfe087fce569ec6843a4f8c30a9d65533c085ab1
parent af503b044475dc29ce58f715739158036807e94e
author The Android Open Source Project <initial-contribution@android.com> 1349960540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349960540 -0700

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

* commit 'af503b044475dc29ce58f715739158036807e94e':