tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent c559777b16856741f195347e0359836af434f494
parent 02c3d0ee40cbb993e88004d5192212117f373e0d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585023517 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585023517 +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 am: 02c3d0ee40

Change-Id: I7571ab56dd22a2bbca69a7f33ee7e008ee214170