OSDN Git Service

am 40812278: merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Fri, 4 Sep 2009 18:06:16 +0000 (11:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Sep 2009 18:06:16 +0000 (11:06 -0700)
Merge commit '4081227849a0c5037b7a180e6734c74b92a832fc'

* commit '4081227849a0c5037b7a180e6734c74b92a832fc':


Trivial merge