OSDN Git Service

Merge "Remove <merge> from the palette" into tools_r9
authorTor Norbye <tnorbye@google.com>
Thu, 13 Jan 2011 05:08:27 +0000 (21:08 -0800)
committerAndroid Code Review <code-review@android.com>
Thu, 13 Jan 2011 05:08:27 +0000 (21:08 -0800)

Trivial merge