OSDN Git Service

am 9acbd28e: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:35:46 +0000 (07:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 14:35:46 +0000 (07:35 -0700)
* commit '9acbd28e7c22df3f5f59974bf199f08622941248':


Trivial merge