OSDN Git Service

am bd152a26: (-s ours) Merge 3742983d from jb-dev
authorJean-Baptiste Queru <jbq@google.com>
Mon, 14 May 2012 14:26:07 +0000 (07:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 May 2012 14:26:07 +0000 (07:26 -0700)
commit5981b7540ca9d21ab876899b91d26bfb6bbed948
tree5194c72523382f37f4a07ed94cdc1c1a7c4c9e33
parent5c3873c0758e31f1bb83fe85ff265ac04e1d5c56
parentbd152a26939d0b328115fc407b371651df79a06c
am bd152a26: (-s ours) Merge 3742983d from jb-dev

* commit 'bd152a26939d0b328115fc407b371651df79a06c':