tree 811c680309c46e8dd8c8a44f281c86a8aa6fdefc
parent bd12e41ba5e29ee95bc653ffaf5cbd9dbd11d0c9
parent 8bf89f305eb3a2010b1a63048a4aa18ccbc42e78
author John Reck <jreck@google.com> 1319235731 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319235731 -0700

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

* commit '8bf89f305eb3a2010b1a63048a4aa18ccbc42e78':
  Fix the build