OSDN Git Service

am cf8f3b24: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:08:11 +0000 (08:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Oct 2012 15:08:11 +0000 (08:08 -0700)
commitb97f4382aba5727f664d92ff73c4b28858fb63eb
tree4cce1ee701e5656d94ba62d36862ab3c591fc350
parentaf05ad5bb693432c5412af7a7f8d330ccc513965
parentcf8f3b2426c788bb5d83e11bee74e128e9c37309
am cf8f3b24: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cf8f3b2426c788bb5d83e11bee74e128e9c37309':