am b099bab4: (-s ours) Fix doclava to preserve annotations on fields and methods - do not merge.

* commit 'b099bab402ee11e80bc5d7e420540350afc4dfc0':
  Fix doclava to preserve annotations on fields and methods - do not merge.
tree: dfb64747ff6a0b4bc99fec4bbba02636727fefe4
  1. res/
  2. src/
  3. test/
  4. android-changes.txt
  5. Android.mk
  6. build.xml
  7. moe.sh
  8. NOTICE