OSDN Git Service

Merge "DO NOT MERGE" into gingerbread
authorShimeng (Simon) Wang <swang@google.com>
Fri, 15 Oct 2010 21:07:29 +0000 (14:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Oct 2010 21:07:29 +0000 (14:07 -0700)

Trivial merge