tree 3dc228c7e72587952e620ca5664938439dc6fa13
parent 437fb0e7872e00b6d29728cb772f053c580b7897
parent 034670e90b82dfcaf4a43c10d6c320baa04e55ce
author Ryan Mitchell <rtmitchell@google.com> 1560371842 -0700
committer android-build-merger <android-build-merger@google.com> 1560371842 -0700

Merge "Remove stopship for IdmapManager vendor sdk" into qt-dev
am: 034670e90b

Change-Id: Ic7c9b396023e89ca681a2748ac62519137e28c11