tree 67a6f4b07c01ee612a702ca44fe6236b6a77ec04
parent f813234a4e635125e50e5ca21defecd9c58f1c8f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591328952 +0000
committer Jay Patel <pateljay@google.com> 1591333291 +0000

Merge "Merge "Fix TvRecordingClient api issues" am: cce2ca958e am: f7cbbae9e4" into rvc-dev-plus-aosp am: 14bd7ccbb0 am: f9061f953d am: 4276a00208

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

Bug: 134042967

Change-Id: Ib3ca9467b68563383fef4dbc0f11b0f4aa8fd111
(cherry picked from commit 69244518ddf523f716755e571f83e539cb20ed77)