OSDN Git Service

Merge "Bug 5080369: merging new assets"
authorJustin Ho <justinho@google.com>
Mon, 8 Aug 2011 22:56:38 +0000 (15:56 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Aug 2011 22:56:38 +0000 (15:56 -0700)

Trivial merge