tree cb5d8611ddb7ce45fdab78b7f2a1855669d9ae7a
parent b2b1281af047d9bc963473f207b7697eb60385bc
parent 7a0289afbe961a14675bee78f66e009a550f3af3
author Julia Reynolds <juliacr@google.com> 1588720933 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588720933 +0000

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

Change-Id: Ie161169b4df74c223ab00f15361aa5c0ac4f9ec9