tree f93d77faa9943607cf573778a12e7690716415ea
parent 2148e7f00994e9b6b8cbd2dd89c27b7829196867
parent d8c3bf5bb27ee6c487d5ef8c05cabfdaf35ff11c
author Andrei-Valentin Onea <andreionea@google.com> 1549887031 -0800
committer android-build-merger <android-build-merger@google.com> 1549887031 -0800

[automerger skipped] Merge "Fix regression in Dalvik:HEAP_TOTAL" am: deb35fb00b am: 4d65d3cbac
am: d8c3bf5bb2 -s ours
am skip reason: change_id Idc5ad13d4e158659009290f410ce721013345308 with SHA1 07aab083cb is in history

Change-Id: Ib481454e6d27834b4c4126cd83cc5dc23e0b067a