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

Browse source

am: 65f7b2d616

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

...

This commit is contained in:

Josh Gao 2016-02-24 22:14:05 +00:00 • committed by android-build-merger

parent 89c789ae47 65f7b2d616

commit f25e2dfd3f

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 is not available