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)
commitb5b52e73e9070408c6dd8b2d04a5f47ee50057b8
treef7adb8c7787c10fd6709b1c5f25066ca028eb8bc
parent8478dbc85fab5db5595910a5a0615ec74778ce68
parent089111a80a6a167de827bf32ae2d2a935ff5874f
am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '089111a80a6a167de827bf32ae2d2a935ff5874f':