OSDN Git Service

am 137e5a3b: Merge "Fix the build"
authorBen Murdoch <benm@google.com>
Thu, 8 Aug 2013 22:55:20 +0000 (15:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 22:55:20 +0000 (15:55 -0700)
commitcf67ae066ff4a4fd8b79f9f2e2be4e5cf7b4d5c9
treeb42d76f1628c8fd4c7e56a290781b1fce7ea2419
parent4cbafb6a9a91c3ad04982269c7ef635876f6f33f
parent137e5a3b5a4682cb57e462583346002b2e381778
am 137e5a3b: Merge "Fix the build"

* commit '137e5a3b5a4682cb57e462583346002b2e381778':
  Fix the build