commit | b6f75ad0323b73e6d8e1c57bfbfddbf9130afb84 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 04 22:11:38 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 04 22:11:38 2022 +0000 |
tree | 87e13b1baee8ac1cad0960313ff0841d373285a0 | |
parent | 2646e5f055b2bca4526f6acfce2f028d050d1537 [diff] | |
parent | e6f05647a4935b5940515c1049bcdd9f9c42eed5 [diff] |
[automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16826865 Change-Id: I1965542abd5e922360de52c2019bfc623161121e