No description
Find a file
Elliott Hughes bb5ec4a926 resolve merge conflicts of 796987482 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb
2017-10-17 12:36:14 -07:00
adb Merge "Set $HOSTNAME in adbd." 2017-10-03 22:32:13 +00:00
adf libadfhwc: Fix adf_hwc_close 2017-03-02 17:40:16 +00:00
base Move some properties users to __system_property_read_callback() 2017-10-10 15:03:33 -07:00
bootstat bootstat: test: duration fixes 2017-10-13 09:29:53 -07:00
cpio Possible null pointer miss on realloc 2017-03-23 22:41:14 +01:00
debuggerd Merge "Move some properties users to __system_property_read_callback()" 2017-10-12 16:53:41 +00:00
demangle Add support for boolean literals. 2017-10-11 15:23:45 -07:00
fastboot fastboot: bail out if failed to generate fs image 2017-08-23 13:43:15 -07:00
fs_mgr Merge "fs_mgr: removing is_device_secure()" 2017-10-15 02:48:33 +00:00
gatekeeperd resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master 2017-09-15 16:50:34 +09:00
healthd resolve merge conflicts of 796987482 to stage-aosp-master 2017-10-17 12:36:14 -07:00
include Move android_filesystem_config.h => fs_config.h 2017-08-02 16:31:19 -07:00
init Merge "Only allow UTF8 encoded property values" 2017-10-17 16:17:21 +00:00
libappfuse libappfuse: use an explicit buffer size 2017-08-02 14:11:25 -07:00
libasyncio adb: Use kernel aio for functionfs. 2017-08-10 15:12:47 -07:00
libbacktrace Merge "Update the Unwinder object and add tests." 2017-10-05 20:46:01 +00:00
libbinderwrapper libbinderwrapper: Android.mk -> Android.bp 2017-04-25 15:55:26 -07:00
libcrypto_utils Mark the modules as VNDK in Android.bp 2017-09-14 08:35:16 +00:00
libcutils resolve merge conflicts of 796987482 to stage-aosp-master 2017-10-17 12:36:14 -07:00
libdiskconfig Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]] 2017-10-02 10:44:29 -07:00
libgrallocusage Mark libgrallocusage as vendor_available 2017-05-04 12:25:43 +09:00
libion Merge "libion: Adapt to new ION interface" 2017-09-21 01:06:32 +00:00
libkeyutils Add libkeyutils. 2017-05-10 14:53:28 -07:00
liblog Add vendor_available to liblog_headers. 2017-10-17 12:09:50 +09:00
libmemtrack Mark libmemtrack as VNDK in Android.bp 2017-09-14 02:46:36 +00:00
libmemunreachable Silence static analyzer warnings about memory leaks 2017-09-24 13:36:29 -07:00
libmetricslogger libmetricslogger: Fix the out-of-sync proto IDs for boot reason. 2017-10-06 14:30:08 -07:00
libnativebridge Remove default libraries 2017-09-29 13:17:06 -07:00
libnativeloader Remove default libraries 2017-09-29 13:17:06 -07:00
libnetutils Mark the modules as VNDK in Android.bp 2017-09-14 08:35:16 +00:00
libpackagelistparser Remove LOCAL_CLANG and clang: true 2017-07-25 14:29:50 +02:00
libpixelflinger Va_end should be used with va_start 2017-03-23 22:41:42 +01:00
libprocessgroup Add memcg related configs to init. 2017-07-18 15:58:40 -07:00
libprocinfo Mark the modules as VNDK in Android.bp 2017-09-14 08:35:16 +00:00
libsparse Merge "<stdbool.h> not necessary in C++." 2017-10-17 19:26:53 +00:00
libsuspend Merge "Mark the modules as VNDK in Android.bp" 2017-09-15 16:31:01 +00:00
libsync Merge "libsync: Add fence info tests" 2017-09-26 23:46:32 +00:00
libsystem fix circular dependency libnativewindow <-> libui 2017-05-09 15:15:50 -07:00
libsysutils Stop depending on libnl. 2017-10-05 14:56:44 +09:00
libunwindstack Use Unwinder object for unwind tool. 2017-10-05 16:05:44 -07:00
libusbhost Mark the modules as VNDK in Android.bp 2017-09-14 08:35:16 +00:00
libutils Add vendor_available to liblog_headers. 2017-10-17 12:09:50 +09:00
libvndksupport Merge "libvndksupport: Do not lookup default namespace for sphal failure" into oc-dev 2017-05-31 07:01:41 +00:00
libziparchive Rename libz-host -> libz 2017-09-27 16:24:45 -07:00
lmkd lmkd: Android.mk -> Android.bp 2017-04-28 15:20:18 -07:00
logcat <stdbool.h> not necessary in C++. 2017-10-17 16:21:33 +00:00
logd Merge "CtsLogdTestCases#sepolicy_rate_limiter failure" 2017-10-02 20:41:06 +00:00
logwrapper Merge "logwrapper: add a benchmark for android_fork_execvp_ext" 2017-03-23 11:56:10 +00:00
mkbootimg mkbootimg: use int for os_version and os_patch_level 2016-03-29 16:06:37 -07:00
qemu_pipe Mark libqemu_pipe vendor_available 2017-06-08 14:16:11 -07:00
reboot reboot: only pause indefinitely for non-shutdown operations 2017-09-29 16:29:52 +00:00
rootdir Merge "console: Add setenv HOSTNAME console" 2017-10-11 20:28:49 +00:00
run-as run-as: Keep supplementary groups. 2017-09-29 15:34:23 -04:00
sdcard Revert "Add derive_gid flag for mounting sdcardfs" 2017-09-22 09:03:18 -07:00
shell_and_utilities Update shell and utilities docs for O. 2017-09-13 20:59:25 -07:00
storaged storaged: stop binder threads before exiting 2017-04-04 19:44:01 +00:00
toolbox Add building and installing of grep for vendor. 2017-06-19 13:12:37 -07:00
trusty Merge "<stdbool.h> not necessary in C++." 2017-10-17 19:26:53 +00:00
.clang-format Add a 2 width option of clang format. 2017-03-10 13:01:39 -08:00
.clang-format-2 Only allow short functions in class definitions. 2017-03-28 12:31:37 -07:00
.clang-format-4 Only allow short functions in class definitions. 2017-03-28 12:31:37 -07:00
.gitignore Ignore adb/*.pyc files 2015-08-11 12:59:58 -07:00
Android.bp Export android_filesystem_config.h as a filegroup 2017-01-17 18:20:28 -08:00
Android.mk
CleanSpec.mk Removing $(PRODUCT_OUT)/root/root 2017-09-28 18:10:58 +08: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
platform_tools_tool_version.mk Fix warning on the build servers 2017-05-25 12:35:40 -07:00
PREUPLOAD.cfg Add a PREUPLOAD.cfg file to run git-clang-format on every commit 2017-03-08 16:51:26 +08:00