OSDN Git Service

Merge "DO NOT MERGE" into gingerbread
authorShimeng (Simon) Wang <swang@google.com>
Mon, 13 Sep 2010 18:00:16 +0000 (11:00 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 13 Sep 2010 18:00:16 +0000 (11:00 -0700)

Trivial merge