OSDN Git Service

am 8bf89f30: (-s ours) Fix the build
authorJohn Reck <jreck@google.com>
Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Oct 2011 22:22:11 +0000 (15:22 -0700)
commitb6f5ebd0a412bca1d07e57da8b5abb0d260c3a83
treea9740c018fd675347553e555e2a3d8a0700aff86
parent2b9b071810f01ea26baffc022ae79393a1adfc26
parentf91a2f070a28f92e334d2b9f692a1217c2e8dccc
am 8bf89f30: (-s ours) Fix the build

* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build