Nick Kralevich 0830ce19ae resolved conflicts for merge of 1aa9565c to master ... Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba		2014-07-07 16:27:42 -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	am 45fcfb48: am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging	2014-04-30 23:35:03 +00: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	Use current max product dalvik.vm.heapsize as default dex2oat heap size	2014-06-27 14:19:36 -07: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	Remove inline access control in service_manager.	2014-06-26 15:48:21 -07:00