Go to file
David Pursell b8f947f727 Merge "resolve merge conflicts of a6d5661 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: 20352727af

* commit '20352727af3237c600e876162b806ecc2e54bb01':

Change-Id: I1e3467155fcf1158e2fb8fcdf7e97e03440518eb
2016-06-07 04:45:45 +00:00
adb Merge "adbd: properly close subprocess pipes on Ctrl+C." am: 605628d325 2016-06-06 21:25:03 +00:00
adf Adf: Remove unused variable 2015-07-27 22:08:16 -07:00
base Fix misc-macro-parentheses warnings in init and other core modules. 2016-05-18 18:11:49 -07:00
bootstat Don't hardcode gtest paths. 2016-04-26 13:28:23 -07:00
cpio fs_config: replace getenv('OUT') by new fs_config parameter 2015-07-09 21:47:07 -07:00
crash_reporter crash_reporter: Mark the euid parameter as __unused. 2016-02-26 15:44:46 -08:00
debuggerd Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace." am: dab7d9de03 2016-05-19 00:05:39 +00:00
fastboot Merge "Report errno more often in fastboot." am: 8c5384e50b 2016-05-11 21:50:07 +00:00
fingerprintd Merge "Fix google-explicit-constructor warnings." am: 7bdd6a8b5a 2016-04-30 05:16:35 +00:00
fs_mgr resolve merge conflicts of adadb7d to nyc-dev-plus-aosp 2016-06-01 19:17:11 +00:00
gatekeeperd Merge "Fix google-explicit-constructor warnings." am: 7bdd6a8b5a 2016-04-30 05:16:35 +00:00
healthd Merge "Export libbinder headers from libhealhd.default" am: c2241b9 2016-04-18 17:15:08 +00:00
include Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990 2016-06-03 19:46:05 +00:00
init resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp 2016-06-06 21:19:55 -07:00
libbacktrace Merge "Remove invalid uses of -l and -I" am: 5d6193c658 2016-06-01 21:57:27 +00:00
libbinderwrapper core: Update libchrome APIs to r395517 2016-05-26 11:29:53 -07:00
libcrypto_utils Fix include-what-you-use problem in android-pubkey.c. 2016-04-15 17:44:05 -04:00
libcutils Merge "Add utility to prepare files in a similar way to directories" into nyc-dev am: 6a29fe931d 2016-06-02 10:33:42 +00:00
libdiskconfig Move libdiskconfig headers into libdiskconfig. 2016-02-13 12:48:23 -08:00
libion Fix misc-macro-parentheses warnings in libion, libsparse, libmem* 2016-05-18 15:41:16 -07:00
liblog Merge "Remove deprecated Android.mk files" am: ce5b4fee23 2016-06-02 16:41:27 +00:00
libmemtrack Fix misc-macro-parentheses warnings in libion, libsparse, libmem* 2016-05-18 15:41:16 -07:00
libmemunreachable Fix misc-macro-parentheses warnings in libion, libsparse, libmem* 2016-05-18 15:41:16 -07:00
libnativebridge Remove invalid uses of -l and -I 2016-06-01 13:41:23 -07:00
libnativeloader Merge "Remove invalid uses of -l and -I" am: 5d6193c658 2016-06-01 21:57:27 +00:00
libnetutils resolve merge conflicts of 3e2f31f to nyc-mr1-dev-plus-aosp 2016-05-18 21:28:17 -07:00
libpackagelistparser Remove two bogus libutils dependencies. 2016-02-17 11:54:47 -08:00
libpixelflinger Fix misc-macro-parentheses warnings in init and other core modules. 2016-05-18 18:11:49 -07:00
libprocessgroup resolve merge conflicts of cea1d04 to nyc-dev-plus-aosp 2016-06-06 21:19:55 -07:00
libsparse Fix misc-macro-parentheses warnings in libion, libsparse, libmem* 2016-05-18 15:41:16 -07:00
libsuspend Adds a parameter to the wakeup_callback to report sucessful wakeup or suspend aborts. 2015-06-25 13:15:22 -07:00
libsync Cleanup uses of sprintf so we can deprecate it. 2016-03-07 18:40:40 -08:00
libsysutils Merge "Clean up CLOEXEC in SocketListener." am: ed83cfba68 2016-02-23 18:51:22 +00:00
libusbhost libusbhost: add usb_device_reset 2016-01-13 16:01:42 -08:00
libutils Merge "Fix SharedBuffer. Remove aref." am: 069517574e 2016-05-23 22:22:18 +00:00
libziparchive Merge "Fix google-explicit-constructor warnings." am: e1d5c25 2016-04-26 00:49:15 +00:00
lmkd resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp 2016-05-19 16:02:22 -07:00
logcat logpersist: switch to pgrep from ps 2016-06-02 09:51:13 -07:00
logd Fix misc-macro-parentheses warnings in liblog. 2016-05-18 15:48:50 -07:00
logwrapper Don't go busy loop when waiting child process. 2016-02-16 10:13:48 -08:00
metricsd core: Update libchrome APIs to r395517 2016-05-26 11:29:53 -07:00
mkbootimg mkbootimg: use int for os_version and os_patch_level 2016-03-29 18:27:13 -07:00
reboot reboot: Turn on -Werror 2014-05-21 12:58:38 -07:00
rootdir Merge "Create /data/ota_package for OTA packages." into nyc-mr1-dev 2016-06-07 04:43:14 +00:00
run-as run-as should accept /data/user/0 symlink 2016-03-21 07:56:46 -06:00
sdcard Merge "enable integer sanitizer for sdcard service" am: 532ab82e10 2016-05-06 17:10:38 +00:00
toolbox Remove toolbox ioctl. 2016-06-04 08:12:34 -07:00
trusty trusty: storageproxyd: use upstream kernel headers 2016-05-24 14:52:38 -07:00
tzdatacheck Track rename of base/ to android-base/. 2015-12-04 22:00:26 -08:00
.gitignore Ignore adb/*.pyc files 2015-08-11 12:59:58 -07:00
Android.mk Remove the simulator target from all makefiles. 2011-07-11 22:12:32 -07:00
CleanSpec.mk trusty: add gatekeeper module 2016-05-03 15:49:51 -07:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2013-07-30 13:56:49 -07:00
NOTICE Fix omission in NOTICE file. 2013-07-30 13:56:55 -07:00