tree 2a7b1eab9cd3ac7defcc34f16b5b0108d2a58234
parent bad10488bca7c8450760c6115857fbc47e1052ef
parent 24e13975608fd3b9de3daff3b3aeec6e26b5890e
author Elliott Hughes <enh@google.com> 1268204641 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1268204641 -0800

am 40bd3d28: Merge "Work around droiddoc bug http://b/2022288."

Merge commit '40bd3d28fb2f34f060e7413cc19eeeb195c0ff90' into dalvik-dev

* commit '40bd3d28fb2f34f060e7413cc19eeeb195c0ff90':
  Work around droiddoc bug http://b/2022288.