tree 70427211cfe16eb8e43b5fc8c854e32cad194540
parent 1e5442696512a634c0bed78097b94615bb6a7c25
parent d9f878356eef20a1ee6d8e996e11a5549b114104
author Xin Li <delphij@google.com> 1599796760 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796760 +0000

[automerger skipped] Merge Android R am: 8854587231 -s ours am: 803d9f6e61 -s ours am: d9b3869e14 -s ours am: d9f878356e -s ours

am skip reason: Change-Id Icdb90bf3af72f16e59dee05fea2b4911750a8243 with SHA-1 b9595f8b0c is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/1422460

Change-Id: I3953b6e927ba8ce8f6969ac9c074816520bedcc3