OSDN Git Service

Reconcile with gingerbread-mr2-release
authorJean-Baptiste Queru <jbq@google.com>
Wed, 1 Jun 2011 20:27:30 +0000 (13:27 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 1 Jun 2011 20:27:33 +0000 (13:27 -0700)
Change-Id: I98de118c52ed658a448c2e885a481eece75257a3


Trivial merge