OSDN Git Service

am 24152c6d: merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Wed, 14 Oct 2009 23:19:06 +0000 (16:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Oct 2009 23:19:06 +0000 (16:19 -0700)
Merge commit '24152c6d4f1645ce02940573a1a33a60f2c7a74a'

* commit '24152c6d4f1645ce02940573a1a33a60f2c7a74a':


Trivial merge