tree 73f9f17cd06b20900d30b446fab57811306bae63
parent 632d04688ecb47d854ee5a048def197486d29032
parent 8f243ec22dd885c3c904364f4a33412fe8d9a66c
author Xin Li <delphij@google.com> 1599784837 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784837 +0000

[automerger skipped] Merge Android R am: 8f243ec22d -s ours

am skip reason: Change-Id Idee0d7e25684262c53f897679768e753000fffab with SHA-1 632d04688e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/LinkViewer/+/1421766

Change-Id: I1c0de6f292a32bff1b12475d370c434c9f94fd33