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)
commitaf9a91ecad2dc309ad84de47a97000cf5432f49b
tree8d404ede2a2946cc73190961a9eb2d89baa53980
parent51acc325285233d9edad286b1ed461735f8aa546
parent1b4ae4c3b71f73c54174425a6c2d0fbaec071f12
Merge "Remove <merge> from the palette" into tools_r9