OSDN Git Service

Merge "Support for editing id, text, string and reference properties"
authorTor Norbye <tnorbye@google.com>
Fri, 7 Jan 2011 15:13:23 +0000 (07:13 -0800)
committerAndroid Code Review <code-review@android.com>
Fri, 7 Jan 2011 15:13:23 +0000 (07:13 -0800)

Trivial merge