Jiyong Park c9c527f81f resolve merge conflicts of fbe942724 to oc-dev-plus-aosp ... Test: I solemnly swear I tested this conflict resolution. Merged-In: I137c17d55940b783eab6d0125bc4d26b96bcc2f2 Change-Id: I90c3ff7c82a9b53ce00057fd87cf227d5faf0975		2017-05-17 14:29:44 +09:00
..
etc	resolve merge conflicts of fbe942724 to oc-dev-plus-aosp	2017-05-17 14:29:44 +09:00
Android.mk	Configure ld.config.txt for SP-HALs	2017-04-14 16:39:36 +09:00
asan.options	Asan.options: Use abort_on_error	2016-08-16 15:45:56 -07:00
asan.options.off.template	Rootdir: Add more asan.options support	2016-06-23 14:45:35 -07:00
init-debug.rc	init-debug.rc: don't mount debugfs	2017-03-14 21:56:24 -07:00
init.environ.rc.in	Add global GCOV_PREFIX option.	2017-02-27 15:00:18 -08:00
init.rc	Revert "disable module loading after BOOT_COMPLETED broadcast"	2017-05-10 13:39:28 -07:00
init.usb.configfs.rc	Move adbd stopped trigger for configfs into core.	2017-04-27 14:59:48 -07:00
init.usb.rc	Remove redundant action triggers on persist.sys.usb.config	2016-08-01 21:56:23 +00:00
init.zygote32.rc	Restart wificond when zygote died	2017-01-07 19:45:42 -08:00
init.zygote32_64.rc	Reapply 1339871138: Only apply schedTune boost to top-app tasks	2017-02-13 17:34:51 +00:00
init.zygote64.rc	Restart wificond when zygote died	2017-01-07 19:45:42 -08:00
init.zygote64_32.rc	Merge "Revert "Revert "Lazily preload secondary zygote resources."""	2017-02-16 12:31:02 +00:00
ueventd.rc	Merge "Adding 'uhid' permission for access to /dev/uhid." am: cecbc9993d am: 04daed4793	2017-05-12 01:00:46 +00:00