tree 303b8ebc0cdc324d4f8ecdd49249b2c2171c1f7b
parent be1485faecb78b4c5735902ca7ba89aed1de5954
parent 67a3ffc22fb3ef3fba87d1e91c352660beaab1ba
author Tianjie Xu <xunchang@google.com> 1553645140 -0700
committer android-build-merger <android-build-merger@google.com> 1553645140 -0700

Merge "Move out the code to parse block map in MemMap" am: f1cbd2f7f2
am: 67a3ffc22f

Change-Id: I7b67c62c39e202fed0f1a999ecccaa96fa84e10a