OSDN Git Service

Merge "Asset import from ux-assets" into klp-dev
authorAdam Powell <adamp@google.com>
Tue, 24 Sep 2013 22:38:22 +0000 (22:38 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 Sep 2013 22:38:22 +0000 (22:38 +0000)

Trivial merge