| commit | 9b8d01eda9c0c4155642472bbfc32d01e2683946 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Feb 24 22:20:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 22:20:48 2016 +0000 |
| tree | 38839867d53dfce7d17033f37ce2100891b6b2e2 | |
| parent | 1f4ea2c2fceb34c72bb054039d5767467e45c19b [diff] | |
| parent | 8f621db57bd89bcf5e6ba135ebaa012c61078abd [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 am: f25e2dfd3f * commit 'f25e2dfd3f441b6cfbee30a18bb5507dee28349a': debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE