tree 6e6057a949f66879e4c46658d6b89a5d4acb1ffd
parent 859f63e840a7af23c7ac9b656d9c242925ceace2
parent 45950f4fc4d7fe217ea710ddd2049ac5e64e9d85
author Yuntao Xu <yuntaoxu@google.com> 1619803836 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619803836 +0000

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

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

Change-Id: I7a24591841b7a54d9ba967cd19452da334686b76