OSDN Git Service

Merge "Fixing the build breakage due to bad merge."
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 28 Oct 2011 23:42:06 +0000 (16:42 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 28 Oct 2011 23:42:06 +0000 (16:42 -0700)

Trivial merge