platform_packages_providers_TvProvider, branch master Unnamed repository; edit this file 'description' to name the repository. Merge "Add start_time and end_time for PreviewPrograms" 2021-10-12T16:37:17+00:00 wyau wyau@google.com 2021-10-12T16:37:17+00:00 cc4490ed48d617241fa38144da158982469f8f04 






Merge Android 12
2021-10-06T22:54:10+00:00

Xin Li
delphij@google.com

2021-10-06T22:54:10+00:00

a86c1c33a246e4491249aa1558edd2daee8681e0

Bug: 202323961
Merged-In: I381fa65f5fe135c56401f5a0e6b29c8e121c8126
Change-Id: I52f17efb0650cb391b3a1cba9a30d40f3c92bf19





Bug: 202323961
Merged-In: I381fa65f5fe135c56401f5a0e6b29c8e121c8126
Change-Id: I52f17efb0650cb391b3a1cba9a30d40f3c92bf19







Add start_time and end_time for PreviewPrograms
2021-10-05T17:44:47+00:00

Wally Yau
wyau@google.com

2021-10-01T01:39:48+00:00

681d456998945e77af997866605e7336b4025630

TV Content recommendation requires the start and end time for
certain type of video program such as movie and TV episode.

Bug: 148432318
Test: cts-tradefed run cts -m CtsTvTestCases
Change-Id: I6bb82933c3ce04cfc8b54cc6beb78f413692beaa





TV Content recommendation requires the start and end time for
certain type of video program such as movie and TV episode.

Bug: 148432318
Test: cts-tradefed run cts -m CtsTvTestCases
Change-Id: I6bb82933c3ce04cfc8b54cc6beb78f413692beaa







Merge sc-dev-plus-aosp-without-vendor@7634622
2021-08-14T06:30:59+00:00

Xin Li
delphij@google.com

2021-08-14T06:30:59+00:00

4f80d47450fd2709d4b8fc7be3f2861b31266c11

Merged-In: I9abd924a5888caa29bbb2d669917891afbaf23eb
Change-Id: I381fa65f5fe135c56401f5a0e6b29c8e121c8126





Merged-In: I9abd924a5888caa29bbb2d669917891afbaf23eb
Change-Id: I381fa65f5fe135c56401f5a0e6b29c8e121c8126







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 41717d0fa6 -s ours
2021-07-28T23:55:10+00:00

Bill Yi
byi@google.com

2021-07-28T23:55:10+00:00

507742f7904d400647a4aba6f4b7eacab2756602

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15411989

Change-Id: I9abd924a5888caa29bbb2d669917891afbaf23eb





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15411989

Change-Id: I9abd924a5888caa29bbb2d669917891afbaf23eb







Import translations. DO NOT MERGE ANYWHERE
2021-07-28T21:44:53+00:00

Bill Yi
byi@google.com

2021-07-28T21:44:53+00:00

41717d0fa68d5dd276c3ac538a2ec68e5de97ade

Auto-generated-cl: translation import
Change-Id: Id913a6c48a3e47dbc54314eec6f65831dda49db3





Auto-generated-cl: translation import
Change-Id: Id913a6c48a3e47dbc54314eec6f65831dda49db3







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b363cd02b7 -s ours am: f4a6af6876 -s ours
2021-07-24T07:30:07+00:00

Bill Yi
byi@google.com

2021-07-24T07:30:07+00:00

a54640d4c7e059faf606a78d3680f65f06dd6b14

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379625

Change-Id: I5a9231b981d8652cab2fffcf1ed16b10868a5747





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379625

Change-Id: I5a9231b981d8652cab2fffcf1ed16b10868a5747







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b363cd02b7 -s ours
2021-07-24T07:17:29+00:00

Bill Yi
byi@google.com

2021-07-24T07:17:29+00:00

f4a6af6876f0643ef4ea4c6fac0fe4260a665be5

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379625

Change-Id: I4ec0c3b62dd44920cbe100def1dc453991cba274





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379625

Change-Id: I4ec0c3b62dd44920cbe100def1dc453991cba274







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47d0789ffe -s ours am: 813a185097 -s ours
2021-07-24T06:23:04+00:00

Bill Yi
byi@google.com

2021-07-24T06:23:04+00:00

6068279e85287bd5cc8cab914d78da26dc6cff0f

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379623

Change-Id: I949eaddfe6611f2425503724b26ca52a1d17d822





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379623

Change-Id: I949eaddfe6611f2425503724b26ca52a1d17d822







[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47d0789ffe -s ours
2021-07-24T06:06:40+00:00

Bill Yi
byi@google.com

2021-07-24T06:06:40+00:00

813a185097442207c85c8c48f76625a0e1d7f8d5

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379623

Change-Id: Icd399f5791916227a96edcc2191e136d79e762e4





am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/15379623

Change-Id: Icd399f5791916227a96edcc2191e136d79e762e4