tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 180c539ef287da6d26ca7fef46fcfeb3303e4568
parent c90b491a81636eb663e7018753af175419bd5a46
author TreeHugger Robot <treehugger-gerrit@google.com> 1584603967 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584603967 +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 am: c90b491a81

Change-Id: Ia4dca4844ae1e29df7f856f09999270e09b7f34c