Xia Wang e37f468ed4 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 ... Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0		2011-03-10 15:09:46 -08:00
cmds
include	Input improvements and bug fixes.	2011-03-09 18:30:28 -08:00
libs	Input improvements and bug fixes.	2011-03-09 18:30:28 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00