Adam Lesinski 5f1dfc11b4 Merge commit '217a04ba' into manualmerge ... Change-Id: I526cf2be7949fa52ce0f70f9a1f671669140679a		2015-05-18 15:19:30 -07:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am b8e6cb08: am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native."	2015-05-16 00:43:19 +00:00
data/etc	Adding a configuration file to support hifi sensors feature.	2015-04-10 11:26:02 -07:00
include	Merge commit '217a04ba' into manualmerge	2015-05-18 15:19:30 -07:00
libs	Merge "Refactor ConsumerBase and it's derived classes." into mnc-dev	2015-05-18 21:29:39 +00:00
opengl	Merge "Modify EGL to disconnect the window when the surface gets destroyed." into mnc-dev	2015-05-14 16:39:28 +00:00
services	am 7c000280: Merge changes from topic \'button_actions\' into mnc-dev	2015-05-14 19:29:01 +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