Irfan Sheriff 6717a36a94 am 5389c80d: (-s ours) am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE ... * commit '5389c80d1f7c9d2710a47ccf70cce94c2d5d9599': Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""		2011-06-23 08:16:44 -07:00
cmds	KeyStore.reset changes	2011-06-02 16:24:45 -07:00
include	Merge "SurfaceTexture: fix a NULL ptr dereference."	2011-06-20 15:34:00 -07:00
libs	SurfaceTexture: make tests use a large framebuffer.	2011-06-20 15:42:57 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	fix RefBase so it retains binary-compatibility with gingerbread	2011-06-13 18:39:45 -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