am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev

* commit '84adc43a70302278eea4d9c198e14c88d6432f9c':
  Fix issue #18706195: Improve label names of memory types
This commit is contained in:
Dianne Hackborn
2014-12-11 02:05:11 +00:00
committed by Android Git Automerger

View File

@@ -296,7 +296,7 @@ public final class Debug
case 1: return "Stack";
case 2: return "Cursor";
case 3: return "Ashmem";
case 4: return "Gfx driver";
case 4: return "Gfx dev";
case 5: return "Other dev";
case 6: return ".so mmap";
case 7: return ".jar mmap";
@@ -306,9 +306,9 @@ public final class Debug
case 11: return ".oat mmap";
case 12: return ".art mmap";
case 13: return "Other mmap";
case 14: return "Graphics";
case 15: return "GL";
case 16: return "Memtrack";
case 14: return "EGL mtrack";
case 15: return "GL mtrack";
case 16: return "Other mtrack";
case 17: return ".Heap";
case 18: return ".LOS";
case 19: return ".LinearAlloc";