OSDN Git Service

am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:28:02 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 22:28:02 +0000 (15:28 -0700)
commit4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c
tree44bcce495cb9b4e5865b481b41ef3e884b721726
parente2ca21cdc583071c19a4fe2dcb67f25dbdd32fe1
parent992b10f49def736e424b9d6e01130de28b09cd1f
am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge

* commit '992b10f49def736e424b9d6e01130de28b09cd1f':