Naveen Leekha c4bd721137 resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev ... Change-Id: I543df164076b44578b14d41031800bb62b81586d		2015-09-24 15:55:21 -07:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Command to move private app data between volumes.	2015-04-10 00:21:35 -07:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear	2015-06-25 01:27:44 +00:00
libs	resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev	2015-09-24 15:55:21 -07:00
opengl	libEGL: Add wrappers for partial update functions	2015-04-15 13:02:27 -07:00
services	am ef47c080: am 958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"	2015-04-24 16:12: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