tree 5c520aaa1b82b8aa6d0df71a7bfe16f994888777
parent d750d11d169e70750b3d0a86db472495bad2cad7
parent ab1fa0c15fa19cd9a1efbff4cf140449e00355d8
author Julia Reynolds <juliacr@google.com> 1588720127 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588720127 +0000

Merge "Manage/History buttons should be multiuser aware" into rvc-dev am: 32c36ff2a5 am: ab1fa0c15f

Change-Id: Iabc9f48df1ade39fbee39ea0852b17e1665e449e