tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent ece6ad59717bc04d53f5b44a5d8fdd0d6d2ed9cf
parent ef7286e95b76ad9cfa8a2b6f0a84b9fb16546e57
author Brad Fitzpatrick <bradfitz@android.com> 1294874891 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294874891 -0800

am b3c7c0ab: Merge "Fix build and javadoc." into honeycomb

* commit 'b3c7c0abdb9ff5fe0ef78b0211a902cac6e2cfe4':
  Fix build and javadoc.