The Android Automerger 54c55f3948 merge in mnc-release history after reset to mnc-dev		2015-06-10 01:02:12 -07:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Merge "Incorporate network diagnostics during a bugreport" into mnc-dev	2015-06-09 23:24:54 +00:00
data/etc	Adding a configuration file to support hifi sensors feature.	2015-04-10 11:26:02 -07:00
include	Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev	2015-06-09 00:04:30 +00:00
libs	Don't corrupt parcel when writeFileDescriptor() fails	2015-06-08 13:13:19 -07:00
opengl	Check that width and height parameters are small.	2015-05-29 10:54:30 -07:00
services	libgui/SurfaceFlinger: Add getConsumerName	2015-06-08 09:40:49 -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