tree 2408820457acdb287122117a0482e8949c6d62a3
parent ac4a190098678acf672f3e152c646be46de7be87
parent 2c60fea7cbfbb4762ce8c8c17a87274c93384bb3
author Sam Lin <samlin@google.com> 1568306656 -0700
committer android-build-merger <android-build-merger@google.com> 1568306656 -0700

Merge "[MultiDisplay] Convert the Android.mk to Android.bp" am: 171b02e636 am: 1a8376f7e7 am: b7e2afa99d
am: 2c60fea7cb

Change-Id: I644d079c8c5b3333378d1efbfca13c09e062ec27