| commit | bab7a3b07454f34600b0d76da6e404b7fd380ac1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 02:03:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 02:03:00 2021 +0000 |
| tree | 52f4cc8588931e1590e9b60f2f04e30035b9db37 | |
| parent | bfaeeaf16ce002bfb3a29d43efdd28181045c5f1 [diff] | |
| parent | b2e0ea74ff8f2610f23554456b750ad3e5527c73 [diff] |
[automerger skipped] Merge Android 12 am: b6f4ef44de -s ours am: b2e0ea74ff -s ours am skip reason: Merged-In I118a1dfd5c52cfe1dbc3b1099f29b4146aff1803 with SHA-1 bfaeeaf16c is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/1847361 Change-Id: I811320adc8cb2704434ba3c97f86c0612c47457f