tree e7e5c6dc48ddb1dcc7fa7224a5bffa9cc6f01859
parent 8c7f2f86952567b950717f3ba7983342f102a6e5
parent 4851cbef3eee945606bccea013551e1f6233961b
author Henry Fang <quxiangfang@google.com> 1639687484 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639687484 +0000

Merge "TvProvider API standardization for ARIB and DVB TvProvider" am: 525fc0dccb am: 4851cbef3e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842094

Change-Id: I3a9f2f5fcf7cf59152f5283cdaee9b3412d7752c