| commit | d198a0a957aa065cfadd7071baba334ed483c152 | [log] [tgz] |
|---|---|---|
| author | Benjamin Schwartz <bsschwar@google.com> | Tue Sep 15 18:58:39 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 18:58:39 2020 +0000 |
| tree | 27583ec6f62abcf51ce35eceeb22380ca9719cd6 | |
| parent | cb0b15acc7343b4569e609bd7d82ce8d1cdc7667 [diff] | |
| parent | a51adf27038ad92706ecd361265c029b15d25a1d [diff] |
Merge "Fix sepolicy name conflict" am: b4993e337a am: 7d4aa10ca7 am: 100ff1ebbf am: a51adf2703 Original change: https://android-review.googlesource.com/c/device/google/coral-sepolicy/+/1425263 Change-Id: I15cf1af1e1e3261f1c67e1e85deb88e32b387032