Chad Jones bacce71e40 Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d'		2015-01-29 10:32:25 -08:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 0e17a265: Merge "Switch dumpstate to "ip link list"."	2015-01-28 17:34:16 +00:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d'	2015-01-29 10:32:25 -08:00
libs	Merge commit 'ec41d55b8d018f349f7687cfe491651db600b51d'	2015-01-29 10:32:25 -08:00
opengl	am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev	2015-01-28 22:38:42 +00:00
services	am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp	2015-01-27 23:42:56 +00:00
MODULE_LICENSE_APACHE2
NOTICE