Jeff Brown bcc45f952b resolved conflicts for merge of ca2b552d to master ... Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b		2011-06-03 15:50:27 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2	2011-06-03 15:30:33 -07:00
libs	am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2	2011-06-03 15:30:33 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "Fix a race that could cause GL commands to be executed from the wrong thread."	2011-05-19 19:42:20 -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