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