tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent 8980f0c12f747ec2c6d73d6b93ce920850a9c62e
parent 79a865afcb5deb2227105786059f4fc84829f920
author Brad Fitzpatrick <bradfitz@android.com> 1294875208 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294875208 -0800

am 5de3dbf3: am 4d27e92d: am b3c7c0ab: Merge "Fix build and javadoc." into honeycomb

* commit '5de3dbf3fa0c9ef5789abfe8ffe0e53071ab893b':
  Fix build and javadoc.