tree 848250357af31d2d3b4e3e48f2b8538169414c80
parent d5cb8b417bd938d9c1ef1262df88ed3d90706301
parent c663d0482b67d028e5b30dbe5f45ef7da2b3e5de
author Josh Gao <jmgao@google.com> 1456351161 +0000
committer android-build-merger <android-build-merger@google.com> 1456351161 +0000

resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796  -s ours am: adc3bcb1d5 am: 7e10520392 am: b97b07e55b
am: c663d0482b

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