tree e895ac0ef95b26822251e6e7f8adea3b7196f69c
parent 49a60ceaa0349f758c0c032adfac4981f9bca92d
parent 862f3ac7898f08cfc401592a4b41a470ac872e4c
author TreeHugger Robot <treehugger-gerrit@google.com> 1585778233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585778233 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 9deb286ecb am: a6779dc9b7 am: 514ed7e61f -s ours am: 455ed2f366 -s ours am: 862f3ac789

Change-Id: I9299a580b60b0ae26bd87fd6820ab1a6a783eaba