tree dfb64747ff6a0b4bc99fec4bbba02636727fefe4
parent 73934887ea87fca353449f0fd476d6c07b349521
parent b099bab402ee11e80bc5d7e420540350afc4dfc0
author Tor Norbye <tnorbye@google.com> 1330622784 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330622784 -0800

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.