tree 695f9adde527b12062f6a9afc9c0cbc402de230e
parent 4ce3086177fff3b556ff42c17ab820a81cb214d5
parent 844b0b7e399d44966343a5edab94ee4ac11886dd
author Tri Vo <trong@google.com> 1553563917 -0700
committer android-build-merger <android-build-merger@google.com> 1553563917 -0700

Merge "ashmemd: add TEST_MAPPING" am: dc0fc79c74 am: 6e165439ae
am: 844b0b7e39

Change-Id: I51d36fa24ca70135403659a407cfb9fd64f02bbd