tree 67723f1da79434700b1b21e1f1bdb7e56d2aa35c
parent 2ec5a44db233ba5732304b3ab919d8efdc881946
parent aeaf16ceb301d6e1c1f33c990528b29cdc1bba32
author Florian Mayer <fmayer@google.com> 1543616077 -0800
committer android-build-merger <android-build-merger@google.com> 1543616077 -0800

Merge "Use cmdline instead for enabling heapprofd." am: 9f1fddca26
am: aeaf16ceb3

Change-Id: Iad7bc2b8b18276e4eb429981c039bc9050d6e6b0