| commit | 7e105203923041986a1bd125d86495663fee3abf | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 21:30:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 21:30:36 2016 +0000 |
| tree | 5b8e8d9c0ca0eccf12b5e4866238f9d097efea7c | |
| parent | 75ccd732f3fef68fc568d96d00a412920798f55c [diff] | |
| parent | adc3bcb1d5e4426273223e0889c7f207abb240f2 [diff] |
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 * commit 'adc3bcb1d5e4426273223e0889c7f207abb240f2': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE