Scott Main cd203770c3 am 02a7f8eb: am 5c35c059: am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 ... * commit '02a7f8eb3a5680a5b4c00b649b461bcb65c665e4': docs: update makefile to show javadocs diffs for api level 12		2011-03-30 16:40:03 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Revert "retire android_native_window_t"	2011-03-30 15:28:21 -07:00
libs	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
opengl	Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream."	2011-03-29 13:34:03 -07:00
services/surfaceflinger	merge libsurfaceflinger_client into libgui	2011-03-25 18:42:40 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00