OSDN Git Service

Merge from open-source gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 2 Feb 2011 17:45:32 +0000 (09:45 -0800)
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461


Trivial merge