tree 0b6a890691545518bc83b40f5330992b5d7ba234
parent 64dc4694c1048ad840d4df6d2edba5075340ea71
parent 7f375887af24d7fcf8cdc7ee4e65fe1ae312eb2b
author Yuntao Xu <yuntaoxu@google.com> 1620172392 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620172392 +0000

Merge "Convert func/Android.mk to Android.bp" am: 05f052f3d7 am: 7f375887af

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

Change-Id: I9673bb0e5a221bcf66d1da18dbfaadda800edafc