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