tree d257168fc36fe3dec7549bdccb8570f1fade9b97
parent 12bac2b6a7795f5ec9f6741b05ce847d223f1209
parent 159a67ecff60261da1abd1364c112e16f9774432
author Florian Mayer <fmayer@google.com> 1540900441 -0700
committer android-build-merger <android-build-merger@google.com> 1540900441 -0700

Merge "Allow to re-initialize heapprofd." am: e898a17e8f
am: 159a67ecff

Change-Id: I1e070a096e3c8a2ba68781eaee2bcb3215008fbd