Eric Fischer ae5ff5abac am f6d1d87d: (-s ours) am 86b7a597: Import revised translations. DO NOT MERGE ... * commit 'f6d1d87df5a8b85c5129aa952f7652eaedd92645': Import revised translations. DO NOT MERGE		2011-03-02 12:53:58 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "Add support for up to 32 buffers per Surface"	2011-03-01 20:08:07 -08:00
libs	Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW."	2011-03-01 14:38:20 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am 0dc5fdb9: am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread	2011-02-27 16:04:42 -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