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)
* commit 'cf8f3b2426c788bb5d83e11bee74e128e9c37309':


Trivial merge