Gloria Wang 85b8ba9fda am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1 ... * commit '54fe58562bb8df5155d4cdf3eb22d950be9dd273': - Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039		2011-03-09 16:07:53 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
libs	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +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