tree b1caec90fae72c015841b016d55705de06a2cc60
parent 0960b45dbc1b7a838ce047f0a6247f1c473796f5
parent 8e3aa20a0e1a1c63b79651e9ed0bc826a02e99cc
author Treehugger Robot <treehugger-gerrit@google.com> 1603228082 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603228082 +0000

[automerger skipped] Merge "Merge redfin/bramble support." am: 01e833073e -s ours am: 75338fd4ab -s ours am: 6f57774d22 -s ours am: 8e3aa20a0e -s ours

am skip reason: Change-Id I93903c258f834a9e9537b88882d77a6660482638 with SHA-1 2ef7e39983 is in history

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

Change-Id: I9055a5378ae26bea550fdd1c94838d8d43f1d9aa