tree 9dd2762f752e48c55ff8b83a9f62e1e26e57802b
parent 5e329055214ceebc73073b4dc1e5b976bfa40895
parent 822ea2298781bdfeac65dc7fde8a73d8f27e4359
author Primiano Tucci <primiano@google.com> 1541195234 -0700
committer android-build-merger <android-build-merger@google.com> 1541195234 -0700

Merge "Add rss_stat, ion_heap_grow, ion_heap_shrink to atrace.rc" am: 900902132e
am: 822ea22987

Change-Id: I2d75af5f5dad15fd54deb8484bb0de556bdfd0c8