resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours

Browse Source

am: adc3bcb1d5

* commit 'adc3bcb1d5e4426273223e0889c7f207abb240f2':
  debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE

...

This commit is contained in:

Josh Gao 2016-02-24 21:30:36 +00:00 committed by android-build-merger

parent 75ccd732f3 adc3bcb1d5

commit 7e10520392

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available