| commit | 79735c8bebba5a99a44e4f84e944fed6e8c59886 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:06:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:06:23 2016 +0000 |
| tree | 635c5e2a191cae8c2262b29fed22d483e1dadedd | |
| parent | ef59a006d66d8e16aa68f7628bf6cd2ffb9d693c [diff] | |
| parent | 0f457184a30ee43406de0da0fdb466e4bbc24df3 [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