Mark Salyzyn df1bc67019 resolved conflicts for merge of d213f5e7 to cw-e-dev ... Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829		2015-08-11 16:27:05 -07:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	resolved conflicts for merge of d213f5e7 to cw-e-dev	2015-08-11 16:27:05 -07:00
data/etc	Add FEATURE_FINGERPRINT to PackageManager's feature list	2015-07-24 02:39:06 +00:00
docs	framework/native/docs: remove doc footer for jd output	2015-05-27 10:13:35 -07:00
include	Merge commit '62ec2dd5' into mm	2015-08-07 18:12:20 +01:00
libs	Bug fix in SensorManager.	2015-07-30 19:05:21 +00:00
opengl	Fix parsing of extension string	2015-07-31 09:26:58 -07:00
services	Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev	2015-08-05 18:48:10 +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