am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."

* commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
  Fix droiddoc generation.