tree 0f7f1db0ccb17c9cae5cf514ee2c892d98980222
parent 62ae1898798c94e3cfbe7e72d29046fe090a1207
parent 0c6bc3c6f3884fe45b748c6604aa5a489ecd9397
author Yuntao Xu <yuntaoxu@google.com> 1620685253 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620685253 +0000

Merge "Convert Android.mk to Android.bp" am: 1ea232f323 am: 2a2569c91f am: 2b1e4b4f3a am: 0c6bc3c6f3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1689287

Change-Id: If5de86d04b27806b9f068185398d3c2c3ba2fd55