satok 1f89aa056d Merge "Change IME picker dialog from Activity to Broadcast"		2011-07-11 22:12:59 -07:00
cmds	Remove more simulator support code.	2011-07-11 13:33:22 -07:00
include	Merge "EGL: fix the ANativeWindow size/fmt override"	2011-07-11 15:47:20 -07:00
libs	Merge "Fix typo in an assert's log"	2011-07-11 18:30:29 -07:00
opengl	Merge changes I002177a6,Ibaff52fe	2011-07-11 17:14:33 -07:00
services/surfaceflinger	fix screen on/off animation (again)	2011-07-08 14:37:06 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00