Gloria Wang b71ac363f3 am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. ... * commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.		2011-05-20 11:05:43 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	resolved conflicts for merge of 06a8ceac to master	2011-05-19 21:44:52 -07:00
libs	resolved conflicts for merge of 06a8ceac to master	2011-05-19 21:44:52 -07:00
opengl	eglTerminate() now actually frees up all active egl objects	2011-05-16 19:03:33 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -07:00
vpn
MODULE_LICENSE_APACHE2
NOTICE