OSDN Git Service

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

* commit '6d547933b8aa3a811499708bc8a4fea551599359':


Trivial merge