diff options
| author | Josh Gao <jmgao@google.com> | 2016-02-24 22:06:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-24 22:06:23 +0000 |
| commit | 65f7b2d6169a2a61fe1d607ca55e690721faf31a (patch) | |
| tree | 635c5e2a191cae8c2262b29fed22d483e1dadedd /libcutils/socket_local_server_unix.cpp | |
| parent | 77dd50b4707b0b2b12d4ca136d8c0529d18eedc1 (diff) | |
| parent | 92e0f8f49d952b365b2be7715a4320d2451d7a67 (diff) | |
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b
am: 92e0f8f49d
* commit '92e0f8f49d952b365b2be7715a4320d2451d7a67':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
Diffstat (limited to 'libcutils/socket_local_server_unix.cpp')
0 files changed, 0 insertions, 0 deletions