tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent 00d8ef98d5107503c49f0509ec3ab8929bc92551
parent e8ca822cfdc9c7e3b141bf83f6fc3a3738b1e21d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585022828 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1585022828 +0000

Merge "[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980" into rvc-d1-dev-plus-aosp