tree d7b8ef5ac62da92ab15330df3ec5d28475ac756c
parent 5767441c19bd4b222a9ea112ddba93e0c2a8a86d
parent 6f57774d22db103ac92b8c70e8b1e6b80843eb09
author Treehugger Robot <treehugger-gerrit@google.com> 1603225100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603225100 +0000

[automerger skipped] Merge "Merge redfin/bramble support." am: 01e833073e -s ours am: 75338fd4ab -s ours am: 6f57774d22 -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: Icaa64e02aa1daad17f419196c5052184c00e9486