tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 96e88222aa4d775dd3195fea18f671327e48b86c
parent fe04158ce4cc2e777171fec49d1bac857e0ad3cd
author TreeHugger Robot <treehugger-gerrit@google.com> 1584601863 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584601863 +0000

[automerger skipped] Merge "Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag"" into qt-qpr1-dev am: fe04158ce4 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic8a27e87f1376610a4ca6d60e8e59f0bd7985b51