commit | a60b5ad1a2d3a8b9ba968cfbd5f7476f3ac5fa12 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:23 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:23 2020 +0000 |
tree | 683d222101913ee4851aafae2183862ff5cb721b | |
parent | 439c1ba67c71b65a4c06a3c65c7b6fe0729654cc [diff] | |
parent | 3c98134af2d50a9dffb099438600f02cd6a781a4 [diff] |
[automerger skipped] Merge Android R am: 3c98134af2 -s ours am skip reason: Change-Id I079159fd1a342ef4769c7f2f7642bcafe52a1b34 with SHA-1 439c1ba67c is in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/1422466 Change-Id: I9b09b8dee6fa4a291a76e8631ced144fefc9320c