| commit | 8f621db57bd89bcf5e6ba135ebaa012c61078abd | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:14:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:14:05 2016 +0000 |
| tree | edb4bdafaa0de5eef6cba00ba6b9188b7c935889 | |
| parent | f7208a04429411143bb079848a6f273cd3a7fd43 [diff] | |
| parent | 79735c8bebba5a99a44e4f84e944fed6e8c59886 [diff] |
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b am: c663d0482b am: 92e0f8f49d am: 65f7b2d616 * commit '65f7b2d6169a2a61fe1d607ca55e690721faf31a': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE