am 8bf89f30: (-s ours) Fix the build

* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build
This commit is contained in:
John Reck 2011-10-21 15:22:11 -07:00 committed by Android Git Automerger
commit b6f5ebd0a4

Diff Content Not Available