James Dong 53536d771e am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 ... * commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8': Revert "Use pread() to get the decrypted data for container based DRM file."		2011-05-25 14:57:45 -07:00
cmds
include	am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	2011-05-25 14:46:53 -07:00
libs	am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)	2011-05-25 14:46:53 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-04-29 17:15:35 -07:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00