Robin Lee c4193f1fef Merge "Migrate keychain directories to /data/misc/user/0"		2014-06-09 12:44:34 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "Migrate keychain directories to /data/misc/user/0"	2014-06-09 12:44:34 +00:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"	2014-06-03 10:06:55 +00:00
libs	Merge "Fix flattening/unflattening of android::Sensor."	2014-06-06 10:05:09 +00:00
opengl	Add aarch64 EGL/GLES trampolines	2014-06-06 16:31:53 -07:00
services	am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"	2014-05-29 19:39:48 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00