Michael Lentine 078794ed37 am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev ... * commit '9853685931298ba02066ebb50a8377ad4aa80f00': Fix output of pointers for 64bit devices.		2014-10-31 22:58:19 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing	2014-10-28 07:21:22 +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	am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor"	2014-10-29 23:08:21 +00:00
libs	am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev	2014-10-31 22:58:19 +00:00
opengl	am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"	2014-10-16 03:06:42 +00:00
services	am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev	2014-10-31 22:57:44 +00: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