OSDN Git Service

merge 83fdc69e from gingerbread - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 02:33:51 +0000 (18:33 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Sat, 15 Jan 2011 02:33:51 +0000 (18:33 -0800)
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680


Trivial merge