OSDN Git Service

Merge "Add palette category metadata"
authorTor Norbye <tnorbye@google.com>
Mon, 24 Jan 2011 18:41:22 +0000 (10:41 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 24 Jan 2011 18:41:22 +0000 (10:41 -0800)

Trivial merge