OSDN Git Service

Merge "Fix build" into jb-mr1-dev
authorMichael Jurka <mikejurka@google.com>
Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Oct 2012 19:25:31 +0000 (12:25 -0700)

Trivial merge