Trevor Johns 1348277a29 Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev" ... This reverts commit 6edfbfabad, reversing changes made to e09b2c16e3. (cherry picked from commit bf234fdfba) Change-Id: Id57aecad79fb601488799ed99437118d1a9faf7c		2016-04-12 18:45:12 +00:00
..
templates-ds	Remove synchronized from the public API docs	2016-02-03 22:10:16 +00:00
templates-ndk	Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"	2016-04-12 18:45:12 +00:00
templates-pdk	Docs: Updating the PDK for the L release.	2014-11-20 18:00:52 +00:00
templates-sac	Remove synchronized from the public API docs	2016-02-03 22:10:16 +00:00
templates-sdk	Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"	2016-04-12 18:45:12 +00:00
templates-sdk-dev	Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"	2016-04-12 18:45:12 +00: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