OSDN Git Service

am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 16:29:40 +0000 (09:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 16:29:40 +0000 (09:29 -0700)
commit1e442932f876bacc96147093c2c37074e590519a
treee842ce919d0a66171876083122259758ea555ebc
parent9766b73c8847d85341c18c8e217a28c8de57ba28
parentcc71f1ea0b090903ea0c9a5b71b1a440c26de101
am cc71f1ea: am d50926a0: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit 'cc71f1ea0b090903ea0c9a5b71b1a440c26de101':
  JZO54H