tree 63b4e34c5e67d8ec2ce4c34896669a9f8fcbdc15
parent d125adca42283777f08abae3171623048fa94b8a
parent 43b912989f6cddca820e98ff29dcedf83a89ddde
author The Android Open Source Project <initial-contribution@android.com> 1352383957 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352383957 -0800

am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '43b912989f6cddca820e98ff29dcedf83a89ddde':
  JOP37