OSDN Git Service

am d9db09d7: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:54:36 +0000 (07:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Nov 2012 14:54:36 +0000 (07:54 -0700)
commit32450ba903c601b4f024d33c51e243b1e6605507
tree46a056a53b3964bd05682d122132868a5a43a439
parent76e678cdde9630e6daa364e156ebd6d53a5768ad
parentd9db09d723538253169d4e297ff4fa974d16809e
am d9db09d7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd9db09d723538253169d4e297ff4fa974d16809e':