Colin Cross ea350ea65a am dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" ... * commit 'dec678dbd240e5c53afac8c3901d5beb23706378': frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH		2014-01-28 01:12:47 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	releax wait timeout on start of dumpstate service	2014-01-15 15:58:54 -08:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Moved androidfw back to frameworks/base	2014-01-27 10:29:16 -08:00
libs	Moved androidfw back to frameworks/base	2014-01-27 10:29:16 -08:00
opengl	am dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"	2014-01-28 01:12:47 +00:00
services	am 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"	2014-01-26 16:50:36 +00:00
MODULE_LICENSE_APACHE2	…
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00