OSDN Git Service

am 26a4777e: (-s ours) Reconcile with jb-dev - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:23:36 +0000 (15:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 22:23:36 +0000 (15:23 -0700)
commit8b9abc4d7f3ed13319003d13c4b2161a36e4ac0f
tree1620136c5e9c31c691bb8d23dfd6a294d0712395
parentc27239cfea8d2b1057d940af5180073c77ebfc0c
parent26a4777e884b78a2133762bc2095eaa7b9583054
am 26a4777e: (-s ours) Reconcile with jb-dev - do not merge

* commit '26a4777e884b78a2133762bc2095eaa7b9583054':