James Dong ab375862e9 am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1 ... * commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd': Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.		2011-03-16 15:11:03 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1	2011-03-15 13:44:58 -07:00
libs	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
opengl	SurfaceTexture: disallow unsupported uses.	2011-03-15 10:37:37 -07:00
services/surfaceflinger	SurfaceFlinger: Respect the PROTECTED gralloc bit.	2011-03-10 16:25:48 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of 00118a48 to honeycomb-merge	2011-01-27 18:25:32 -08:00