Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436
am: 97d8fa99d2
" into udc-qpr-dev-plus-aosp am: 2d4767736f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25422286 Change-Id: I90daa087ffa06c6b99e6fd5f95574f51954a5fe4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4f49b25fdc