tree 94296a44ec93dba339eda106e7e58a6220c0c765
parent 2ef7e3998372ea8ea6ebb539bc4b8ec2486b5573
parent 01e833073e90c150141190f8af0cb47813b605bc
author Treehugger Robot <treehugger-gerrit@google.com> 1603220627 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603220627 +0000

[automerger skipped] Merge "Merge redfin/bramble support." am: 01e833073e -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: Ib03e45e36f9145f9e9acb7959a00fc72661762c5