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

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

pranav01/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,hagar006/platform_manifest,knone1/platform_manifest,ND-3500/platform_manifest,Hybrid-Power/startsync,fallouttester/platform_manifest,xorware/android_build,xorware/android_build,see4ri/lolili,RR-msm7x30/platform_manifest