tree e842ce919d0a66171876083122259758ea555ebc
parent 9766b73c8847d85341c18c8e217a28c8de57ba28
parent cc71f1ea0b090903ea0c9a5b71b1a440c26de101
author The Android Open Source Project <initial-contribution@android.com> 1348504180 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348504180 -0700

am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
  JZO54H