tree fb524173d0a6a5d7d6320b95af3f943c0221303b
parent 143d0df656bdb213be7b0198f66603f7869f54b7
parent 3201b52bd538b3d58d2c516a313712dcdfe4239a
author Mathieu Chartier <mathieuc@google.com> 1491957116 +0000
committer android-build-merger <android-build-merger@google.com> 1491957116 +0000

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62 am: f62b12ae31 am: 540bc2d94e
am: 3201b52bd5

Change-Id: I7e2f8da8b8b23cb9f567e3ec384120a1ac4b3c07