| commit | 4d11ad53135ebe00138748cf1091b013d3219fe7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 09:00:02 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 09:00:02 2021 +0000 |
| tree | e78b745fc37b351b4ce7356181f967d9e35dd8b0 | |
| parent | df97271462557a63564bf023e94028d08a1be157 [diff] | |
| parent | 2a9e7b85e35a19c62fb5e618d712ce84067f3c28 [diff] |
[automerger skipped] Merge Android 12 am: ad1cb334e6 -s ours am: 257ad82c80 -s ours am: ae876cb4b2 -s ours am: 60534bf67c -s ours am: 2a9e7b85e3 -s ours am skip reason: Merged-In Ifa23f1acbb803e69b6a9cf08acdeaf442874a63c with SHA-1 880a3095fe is already in history Original change: https://android-review.googlesource.com/c/device/google/barbet-sepolicy/+/1847339 Change-Id: I056497d6db251c1988523d4dabf351a18ca5e35c