Lorenzo Colitti 2d62faa1e3 am 63a8e04d: am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev ... * commit '63a8e04d2da0daf6802ecea2048f9eb9a9a8b878': Include the VPN server IP address in the VPN state file.		2014-09-23 19:06:31 +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-dev-plus-aosp	2014-09-18 20:05:27 -07:00
libs	resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp	2014-09-18 20:05:27 -07: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-dev-plus-aosp	2014-09-18 20:05:27 -07:00
MODULE_LICENSE_APACHE2
NOTICE