tree e98203b4edb4b62afbd60081edc08bdb36b63604
parent c9cc9611eccdd57cca418e82ff4c6ba0e0ba02c7
parent 7d4aa10ca7eb9687202ef1b0bc84843624ca7764
author Benjamin Schwartz <bsschwar@google.com> 1600192739 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600192739 +0000

Merge "Fix sepolicy name conflict" am: b4993e337a am: 7d4aa10ca7

Original change: https://android-review.googlesource.com/c/device/google/coral-sepolicy/+/1425263

Change-Id: I77a3a86f6daaf63ef55371f2c406a676600be025