Narayan Kamath 1bdade0571 resolved conflicts for merge of fd5a3e06 to lmp-mr1-dev-plus-aosp ... Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2		2014-11-20 11:04:43 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"	2014-11-14 00:30:33 +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 1bb53054: Merge "Fix class vs. struct mismatch"	2014-11-17 22:58:50 +00:00
services	am 6b9454d1: SurfaceFlinger: Do less work when using PTS	2014-11-18 02:07:36 +00:00
MODULE_LICENSE_APACHE2
NOTICE