Dan Albert 56b3f887a2 am 6ee97e74: Merge "Fix a null dereference." ... * commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f': Fix a null dereference.		2014-09-23 17:54:39 +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 6ee97e74: Merge "Fix a null dereference."	2014-09-23 17:54:39 +00:00
opengl	am e1e3d278: Merge "Clean cruft out of makefiles."	2014-09-12 16:22:03 +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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00