OSDN Git Service

Merge commit '1b3886b8' into manualmerge
authorBrett Chabot <brettchabot@android.com>
Thu, 8 Oct 2009 21:42:58 +0000 (14:42 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 9 Oct 2009 00:24:02 +0000 (17:24 -0700)

Trivial merge