OSDN Git Service

Merge "Fixing broken unittests."
authorMakoto Onuki <omakoto@google.com>
Mon, 30 Jan 2012 19:16:58 +0000 (11:16 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 30 Jan 2012 19:16:58 +0000 (11:16 -0800)

Trivial merge