tree b98c12d9441ce784dbd0d357bac9dd47c0a95efd
parent 4064b6b92e4b2a670e514b4d5aaf7e6e735af117
parent 295eca1f269acf7471f763f0397d14f2953cc3b3
author Xin Li <delphij@google.com> 1602022674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602022674 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 3c4b9d5283 am: aef9c20ae0 am: dbae408d09 am: 295eca1f26 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I91d1ff774ca85e75bb04eb2d5da0f63bed25cd09