tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 5b67b58e7902d813616ce7db80e3ad81cf520af5
parent 32d24305f006552a85a35a2b0a9e1c5279b69c8d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584603974 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1584603974 +0000

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