| commit | 3d48b1e3ad3e3d6f3ae1f5fffae6d49baa36a79d | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue May 04 23:28:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 23:28:17 2021 +0000 |
| tree | 29bf7af027ddabb668699c0344c44b4f9242b26d | |
| parent | a99990a4ac6fd7e4379ad52c2bf10861ab1be23c [diff] | |
| parent | 2db2a1a447f6335bb31286fa8688e7799abe2664 [diff] |
[automerger skipped] Merge history of framework-annotations am: 5289a4b192 -s ours am: 2db2a1a447 -s ours am skip reason: Merged-In I6ea9fb04bade2567c7079443e09710f69df2e9b8 with SHA-1 dcb8c41826 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/1692945 Change-Id: I72a9a01e6cef416a4598c4038904cad00ca47a45