tree 1af0e4b559306e5494f2952acc98f6eb9a41e15d
parent fe01970c8f91a6b8035b9e6e98d29f031611d48b
author Eugene Susla <eugenesusla@google.com> 1553901242 -0700
committer JP Sugarbroad <jpsugar@google.com> 1591226199 -0700

RESTRICT AUTOMERGE
Prevent accessing companion records from arbitrary uids

Relanding after previous revert.

Test: manual
Bug: 129476618
Change-Id: Ia906d2e16fa8b00eda0a00e622cc21e29fb90481
(cherry picked from commit 8643636095dc9b3c70a62ef16f68df12dff67fe7)