[automerger skipped] Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae am: 355bd7d9b8 am: 44c20b347f -s ours
am skip reason: Change-Id I77f06322fbb06ffa33115c1469aba80e59247904 with SHA-1 1c5d763107 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I416729c9918336989fd4d065a991b606ede3c63e
This commit is contained in:
committed by
Automerger Merge Worker
commit
074cc33c40