OSDN Git Service

am ee7df8ca: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:14:54 +0000 (10:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Sep 2012 17:14:54 +0000 (10:14 -0700)
commit88289d4fb860000dcffda748880b87fec947a9e6
treeb167eba91637780f59b8d132888e9bffbbb089a9
parent0cbc4dfdb47989d1d33e17f3d517aff048c2c4a0
parentee7df8cae454ba6fabd7cb7db88e27013456f891
am ee7df8ca: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ee7df8cae454ba6fabd7cb7db88e27013456f891':