OSDN Git Service

am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:19:14 +0000 (09:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:19:14 +0000 (09:19 -0700)
* commit '089111a80a6a167de827bf32ae2d2a935ff5874f':


Trivial merge