Dirk Dougherty 0bb2c1702a Merge commit 'bb94d790' into manualmerge ... Conflicts: tools/droiddoc/templates-sdk/sample.cs Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0		2014-01-22 17:00:19 -08:00
..
templates-ds	Add jd_lists_unified.cs to sac, pdk, ds templates.	2013-11-20 11:18:19 -08:00
templates-pdk	Add jd_lists_unified.cs to sac, pdk, ds templates.	2013-11-20 11:18:19 -08:00
templates-sac	Add jd_lists_unified.cs to sac, pdk, ds templates.	2013-11-20 11:18:19 -08:00
templates-sdk	Merge commit 'bb94d790' into manualmerge	2014-01-22 17:00:19 -08:00
test	Adding version information to DroidDoc. Rather than pulling the version from	2009-07-21 18:09:39 -07:00
Android.mk	Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava	2010-08-05 15:45:10 -07:00