Chih-hung Hsieh e9034b4502 Merge "Use LOCAL_CLANG := false for GLES wrappers for now"		2014-10-16 02:52:35 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Allow more than one dex2oat extra option	2014-09-17 10:58:35 +00:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Fix clang warnings about struct vs. class.	2014-09-09 15:22:48 -07:00
libs	Merge "Don't check if this == NULL."	2014-10-15 22:45:07 +00:00
opengl	Use LOCAL_CLANG := false for GLES wrappers for now	2014-10-15 22:23:42 +00:00
services	Merge "Don't check if this == NULL."	2014-10-15 22:45:07 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00