The Android Automerger a4ed4ff16f merge in jb-release history after reset to master		2012-04-17 07:02:56 -07:00
build	build: add device-type dalvik heap configs	2012-03-23 09:42:42 -07:00
cmds	Add sdcard_r group to dumpstate.	2012-04-11 12:27:48 -07:00
data/etc	Move com.nxp.mifare to frameworks/native.	2012-04-12 21:24:08 -07:00
include	fix Region const_iterator.	2012-04-16 18:40:30 -07:00
libs	fix Region const_iterator.	2012-04-16 18:40:30 -07:00
opengl	Hibernate the EGL implementation when idle	2012-04-09 21:36:17 -07:00
services	Merge "don't attempt to clip layers anymore using glScissor"	2012-04-16 16:00:11 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00