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)
* commit '137e5a3b5a4682cb57e462583346002b2e381778':
  Fix the build


Trivial merge