OSDN Git Service

Merge "Disallow Java keywords in resource names"
authorTor Norbye <tnorbye@google.com>
Mon, 10 Jan 2011 22:21:21 +0000 (14:21 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 10 Jan 2011 22:21:21 +0000 (14:21 -0800)

Trivial merge