tree e06382568650e15868d530dccc43fe5043356e2c
parent ca0d8990d313b7f1df2f704cdc31ead45ec08aff
parent fd7216cc199f9211863dd53caa56e3be63153c4b
author Tom Cherry <tomcherry@google.com> 1573077240 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1573077240 +0000

Merge changes I01d061c4,I2e3f6ee7

* changes:
  Check that __system_property_set() doesn't leak FDs
  clang-format: Add IncludeBlocks: Preserve