tree 976c52b21e8da1be7eb5f831c7f2f91ac6e14707
parent b9bc86f55a9e36665878655b9a6fb41864055d5d
parent d9fbd5aa8286211e457f6fc432076a5662d527e0
author Yuntao Xu <yuntaoxu@google.com> 1620173434 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620173434 +0000

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

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

Change-Id: I5cc2da5a5ddcdf587e189610877fd46a5f489da1