Christopher Ferris 672e3a51bd resolved conflicts for merge of e8878921 to lmp-dev-plus-aosp ... Change-Id: I930dda54336a3f6d694cec06299f09e3580671a0		2014-07-23 18:03:00 -07:00
..
atrace	am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."	2014-05-29 01:08:06 +00:00
bugreport	releax wait timeout on start of dumpstate service	2014-01-15 15:58:54 -08:00
dumpstate	resolved conflicts for merge of e8878921 to lmp-dev-plus-aosp	2014-07-23 18:03:00 -07:00
dumpsys	add dumpsys -l to list available services	2013-06-13 16:32:26 -07:00
flatland	GLConsumer: Stop using default constructor params	2014-06-24 13:09:19 -07:00
installd	am 4dd0d800: Merge "Fix implicit declaration of function \'prctl\' in installd."	2014-07-19 00:38:11 +00:00
ip-up-vpn	Add liblog	2013-04-09 21:55:39 -07:00
rawbu	Add a note about emulated sdcard in rawbu usage dump	2013-06-14 10:43:39 -07:00
service	libutils clean-up	2013-05-07 18:28:11 -07:00
servicemanager	Add MAC for remaining service_manager functionality.	2014-07-15 10:11:33 -07:00