Dan Albert 8d31934148 am 79749845: Merge "Fix pointer-to-int and int-to-pointer warnings." ... * commit '797498450cbcb87c28636e775ada942005436909': Fix pointer-to-int and int-to-pointer warnings.		2015-02-25 23:00:44 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Merge commit '26cc3d0b67ff4daf31eaeed0ecd87b391978aadb' into HEAD	2015-02-19 14:31:45 -08:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	am 9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"	2015-02-11 20:04:40 +00:00
libs	am f3f22e55: Merge "Add missing <unistd.h> include for close."	2015-02-20 01:13:29 +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 d80268ba: Merge "vsync.cpp test is throwing error whe compiled"	2015-02-23 15:19:59 +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