OSDN Git Service

Merge "Android Design" into ics-mr1
authorRoman Nurik <romannurik@google.com>
Wed, 11 Jan 2012 01:01:45 +0000 (17:01 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Jan 2012 01:01:45 +0000 (17:01 -0800)

Trivial merge