OSDN Git Service

am 2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:06:41 +0000 (08:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 May 2013 15:06:41 +0000 (08:06 -0700)
commit624191ecd8f70f0f0fbeb4cc8553e793e14df3bf
tree2f45ffa355b09d33afe7c5b7fd39e83b80eaa5bf
parent99f40d47581376ac40341cccdbd5c6645c30ec5e
parent2dafd362c7052f1618b0d22d18043d99f4544ac0
am 2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2dafd362c7052f1618b0d22d18043d99f4544ac0':