commit | 9f4e2381d649c242e9aaa80a260376b629363364 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:46 2020 +0000 |
tree | ce1ae0a18576087a5e6129ed28fccdfe4f9dbc73 | |
parent | d3bd5184128d195d0dd7c91fdbbd09a5e3743ae2 [diff] | |
parent | a60b5ad1a2d3a8b9ba968cfbd5f7476f3ac5fa12 [diff] |
[automerger skipped] Merge Android R am: 3c98134af2 -s ours am: a60b5ad1a2 -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: I6764fcec5d0a2c06b5faebfefe9a4f9184f36b7f