Kenny Root a43a0d76a4 resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp ... Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478		2015-05-13 09:10:17 -07:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 9a104951: am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"	2015-05-07 16:45:29 +00:00
data/etc	Adding a configuration file to support hifi sensors feature.	2015-04-10 11:26:02 -07:00
include	resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp	2015-05-13 09:10:17 -07:00
libs	Merge "Verify that the native handle was created" into mnc-dev	2015-05-13 03:38:36 +00:00
opengl	libEGL: whitelist the EGL_KHR_create_context_no_error extension	2015-05-12 08:42:05 -07:00
services	am af8ed3f0: Merge "Improve logging in SensorService dump output." into mnc-dev	2015-05-12 19:30:30 +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