commit | c10472aa7cd7a16ae0b809559915a5a6e0ce3421 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 22:10:04 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 22:10:04 2020 +0000 |
tree | ce1ae0a18576087a5e6129ed28fccdfe4f9dbc73 | |
parent | 7e1d4666016d8b262adc50b991fe892fdbe64c77 [diff] | |
parent | 465abd9aa525285f1324b14676f67a8dc9210448 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ba7d065ebe -s ours am: cb92d7ef3b -s ours am: 465abd9aa5 -s ours am skip reason: Change-Id I776f1a8887137f4cbad61fe08f6e5d0f078df984 with SHA-1 5cf4e8081c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/12470257 Change-Id: I21d2b68c28af84f4a7a1f95a63b6db595dc9641e