tree 73d693e229b06fc93b8149f66e6e6bbede283d91
parent 03dc717219ecaa7b32f7b184c5055549c00ce774
parent 951a22e80eb9e911298b4590975206a773e5ce95
author Yabin Cui <yabinc@google.com> 1626473748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626473748 +0000

Merge "idmap2: fix for compiler update." am: 0cb190e889 am: 951a22e80e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1768613

Change-Id: I6a43049b33454a9fe615325d7812935de6eaea41