Eric Fischer ae438374cf am a0e51ef2: (-s ours) am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread ... * commit 'a0e51ef2a4d5d16ed68b360851c5428b17e75eb4': Import revised translations. DO NOT MERGE		2011-01-29 09:18:14 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Protected surface API	2011-01-28 08:04:00 -08:00
libs	am 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb	2011-01-28 14:15:44 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb	2011-01-28 18:43:08 -08: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