tree 495fc04a3221cb3600dd65ba7effcb5192c0e6de
parent 813790cb0048c6b91c9dc841dbfa94bdf71e050b
parent aef6938a920f9f1bb56ccd464995798d43b5d8c1
author The Android Open Source Project <initial-contribution@android.com> 1344285336 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344285336 -0700

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

* commit 'aef6938a920f9f1bb56ccd464995798d43b5d8c1':
  JOO37B