OSDN Git Service

Merge "Palette with previews, categories and view modes"
authorTor Norbye <tnorbye@google.com>
Wed, 26 Jan 2011 03:24:02 +0000 (19:24 -0800)
committerAndroid Code Review <code-review@android.com>
Wed, 26 Jan 2011 03:24:02 +0000 (19:24 -0800)

Trivial merge