tree f55c000a1e7e883dc88d0c0c37f36f2498eed815
parent 6d94d1116bc5c53b1d3050feeaefc3191ead60b5
parent 7dfe30b1aeffc6c1d70b1dca18b2aff8a991092d
author Yuntao Xu <yuntaoxu@google.com> 1619805000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619805000 +0000

Merge "Convert MultiDisplay/Android.mk to Android.bp" am: 9e504cc4c5 am: 45950f4fc4 am: 7dfe30b1ae

Original change: https://android-review.googlesource.com/c/platform/development/+/1689115

Change-Id: I626f0bc2b8410b0276f5aa204e8b13e26c7c2236