Christopher Ferris 123edd9f81 resolved conflicts for merge of 04e13acd to master ... Change-Id: I9bbc9907a5cbde8b374398493bc0dc6b056ea734		2015-02-26 11:01:57 -08: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 04e13acd to master	2015-02-26 11:01:57 -08:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	Merge "Move inputflinger process to host directory"	2015-02-24 00:06:35 +00:00
libs	am 58573ecd: am 485d3730: am f3f22e55: Merge "Add missing <unistd.h> include for close."	2015-02-20 01:26:57 +00:00
opengl	am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."	2015-02-25 23:00:44 +00:00
services	am beb89e11: am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"	2015-02-26 02:27:29 +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