commit | c27c95ef4c74497d2c76a3f3bfaabb72a91483ed | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue May 04 22:55:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 22:55:01 2021 +0000 |
tree | f60dd98d4e55be12825804d2af1a7fa134f2dc87 | |
parent | 08d82f6e401094c6f38cab97b27065f8cbd61716 [diff] | |
parent | 40d34f3f6bccd2b0df700cdb38d4f68822fdeeed [diff] |
[automerger skipped] Merge history of framework-annotations am: 3a185fd909 -s ours am: 40d34f3f6b -s ours am skip reason: Merged-In I24a753a25583e50d8ca8cf7d2a4f2d0567db6dd2 with SHA-1 35158c4f10 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/14400987 Change-Id: Ibc83b56ccbc177a4ca6bd9892711eefbf112815f