tree fc2bab5645c9cab799b6b5fce4cf32f7f382996a
parent c9f57a8f852b07c83d591acce42d1129b8e3bcf9
parent 84b6eab04601c4b064e97b390be01c3135dd1396
author TreeHugger Robot <treehugger-gerrit@google.com> 1584603206 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584603206 +0000

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

Change-Id: Ib506204d4f602c2ed1974c13be641d3eddec4e48