Elliott Hughes 47513e8739 am 8d84b6f9: am ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS." ... * commit '8d84b6f9f576fe51b2cb4a54042bf95af923e55b': Kill INCLUDE_SYS_MOUNT_FOR_STATFS.		2014-11-20 23:09:45 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."	2014-11-20 23:00:26 +00:00
data/etc	Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev	2014-11-17 18:33:21 +00:00
include	am 55f71bc0: Merge "Replace IInterface::asBinder() with a static"	2014-11-17 18:52:56 +00:00
libs	am 55f71bc0: Merge "Replace IInterface::asBinder() with a static"	2014-11-17 18:52:56 +00:00
opengl	am 22536916: am 1bb53054: Merge "Fix class vs. struct mismatch"	2014-11-17 23:07:39 +00:00
services	am 686c5be4: am 6b9454d1: SurfaceFlinger: Do less work when using PTS	2014-11-18 20:18:27 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00