OSDN Git Service

Merge "Fix the build break in git_master-without-vendor" into honeycomb
authorJames Dong <jdong@google.com>
Tue, 18 Jan 2011 21:26:14 +0000 (13:26 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jan 2011 21:26:14 +0000 (13:26 -0800)

Trivial merge