Justin Ho 4acb2055d2 am 0b397314: am 0b251aec: am 01b13a11: Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1 ... * commit '0b3973143191962d3c4372523ed450f6a5bf0863': Replacing browser playback controls for inactive videos Bug: 4136024		2011-03-30 16:41:41 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00