commit | e7edc6bbccbb501acc8a7ce09c5baaf34263d500 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Tue May 04 22:56:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 22:56:12 2021 +0000 |
tree | f60dd98d4e55be12825804d2af1a7fa134f2dc87 | |
parent | 0d24c0efdfb10717b21686e8f2766ff20fea7e4c [diff] | |
parent | 2c6d6568a09e6e4fd8b9a08692d886e917c7ea6d [diff] |
[automerger skipped] Merge history of framework-annotations am: 3a185fd909 -s ours am: 2c6d6568a0 -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: I7754e79a6d4fb48858c034667738ae94e69c1d0c