Commit 301f6f3e authored by Ryan Savitski's avatar Ryan Savitski Committed by Gerrit Code Review
Browse files

Merge changes I4f001910,Ic251afec 

* changes:
  android_mallopt: opcode preprocess define + missing header
  conditional zygote child heap profiling + android_internal_mallopt
parents 176d2fbc f77928de
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment