OSDN Git Service

am 9f2ef2fb: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:18:49 +0000 (08:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Aug 2012 15:18:49 +0000 (08:18 -0700)
commitc644b14501d0f399923580f59e6c449548fb9d05
tree9907e7f794f0d96ae2a43894a9efab73a695c104
parent284f7fb9ecc9361c43e0b6da24872732f655dc0c
parent9f2ef2fbf5cb26089828ea1b588253bd20ddefa5
am 9f2ef2fb: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9f2ef2fbf5cb26089828ea1b588253bd20ddefa5':