am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"

* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
  Increase the Java heap size for droiddoc