tree 367614cf8c01942a76e2f466cd6a3fdbb89011b8
parent a6918b86f1ed2a28e083dd040205c0e5ab5000b1
parent 2a2569c91f723dbf9dba77ede07700b8acf2ff7c
author Yuntao Xu <yuntaoxu@google.com> 1620682048 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620682048 +0000

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

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

Change-Id: I93a4559471fa968187ca77c0961e95bfdde1c18a