Chia-chi Yeh 5c33d1cadf am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 ... * commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b': Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html		2011-12-02 12:48:35 -08:00
cmds	Remove the simulator target from all makefiles.	2011-07-11 22:12:16 -07:00
include	Merge changes I7e973a35,Ib3386fcc into ics-mr1	2011-11-29 17:46:35 -08:00
libs	Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.	2011-12-01 17:11:32 -08:00
opengl	add a way to access the version string of the h/w implementation of EGL	2011-11-29 18:00:35 -08:00
services/surfaceflinger	Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1	2011-11-30 13:52:21 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00