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)
commit5ded30c9b780c584c9d1984cc019f7d1d0b38fe5
tree076367ed5a5be3f9b614090f7253585cfa6c8db1
parent5f86b90b8a224e21db89bacf78d4bd4d3f44342d
parent2878b06d4ad1a8198bf15c8f304a21042624a702
Merge "Asset import from ux-assets" into klp-dev