am f0d2a546: Merge 78e7f1f0
am f0d2a546: Merge 78e7f1f0

* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc

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