tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 2c4cb44a2e1b14f647e72fcffae2a14a6f8cbbcc
parent 1b0611e00f4218e49cdb2840951c1aee53380539
author TreeHugger Robot <treehugger-gerrit@google.com> 1584605134 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584605134 +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 am: 1b0611e00f

Change-Id: Ice1b78aa116acdcf9de86a1b6bda54718a15f7ad