OSDN Git Service

Merge "Fix the build"
authorBen Murdoch <benm@google.com>
Thu, 8 Aug 2013 11:18:04 +0000 (11:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Aug 2013 11:18:04 +0000 (11:18 +0000)
commit137e5a3b5a4682cb57e462583346002b2e381778
treef286148f87ec412b91efcefaa3ba2e3e7853b382
parentd4db6cbc0fa5b3b1ff7ea18f7b861f0753518e4f
parent365038217553e192d011861422715f8a87b30618
Merge "Fix the build"