Dan Albert 5193aea69a am 56b3f887: am 6ee97e74: Merge "Fix a null dereference." ... * commit '56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da': Fix a null dereference.		2014-09-23 20:55:50 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev	2014-09-23 15:50:59 +00:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
libs	am 56b3f887: am 6ee97e74: Merge "Fix a null dereference."	2014-09-23 20:55:50 +00:00
opengl	Merge "Return EGL_FALSE early when eglInitialize() fails"	2014-09-23 17:16:36 +00:00
services	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00