Skip to content
Commit eff24fc8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion... 

[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 28f2e1df -s ours

am skip reason: subject contains skip directive

Change-Id: I6522ceac8a218bc4ec6598e6bd495ac5019d250f
parents fb992147 28f2e1df
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment