OSDN Git Service

Merge from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:25:27 +0000 (14:25 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 22:25:38 +0000 (14:25 -0800)
Change-Id: I6b895012db6b96666dc3257b1f2e430925981188


Trivial merge