Andreas Huber 22334e264b Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"		2011-06-29 10:23:14 -07:00
cmds	KeyStore: fix test-keystore	2011-06-27 10:38:10 -07:00
include	Merge changes I9fb59763,I8b2c6e00	2011-06-28 12:55:03 -07:00
libs	Merge "Improve input event consistency invariants."	2011-06-28 20:17:59 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge changes I9fb59763,I8b2c6e00	2011-06-28 12:55:03 -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