[automerger skipped] Mark ab/7061308 as merged in stage. am: 377ccb7ae1 -s ours am: 1bc3b563aa -s ours

am skip reason: Change-Id Iaed0adc0e4479d50326f9e3093b2fa497cfc0ec0 with SHA-1 6729b3251b is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c8bc198e902ac2b6481343c8207fb80cda445dc
tree: 7cce80e8e5423d4930a66b0cff33e83e1efe2f9b
  1. include/
  2. Android.bp
  3. memtrack.cpp
  4. memtrack_test.cpp
  5. OWNERS