OSDN Git Service

Merge "Fix compilation errors due to 2 independent changes."
authorTor Norbye <tnorbye@google.com>
Fri, 28 Jan 2011 20:55:40 +0000 (12:55 -0800)
committerAndroid Code Review <code-review@android.com>
Fri, 28 Jan 2011 20:55:40 +0000 (12:55 -0800)

Trivial merge