The Android Automerger 8c9f7cce8b merge in lmp-mr1-release history after reset to 12c4bdad7b		2014-09-23 15:15:26 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Include the VPN server IP address in the VPN state file.	2014-09-19 13:27:56 +09: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	surfaceflinger: add getDisplayStats() method	2014-09-18 17:03:20 -07:00
libs	surfaceflinger: add getDisplayStats() method	2014-09-18 17:03:20 -07:00
opengl	Add rate-limited logging for unimplemented es functions.	2014-09-23 08:30:12 -07:00
services	surfaceflinger: add getDisplayStats() method	2014-09-18 17:03:20 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00