| commit | f5e37373a09299122c1f3c71a93c4d004f918592 | [log] [tgz] |
|---|---|---|
| author | Jared Duke <jdduke@google.com> | Wed Dec 27 23:48:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 27 23:48:51 2023 +0000 |
| tree | cead1fe0ab1754886a7d2e949027dd4af951ee5f | |
| parent | 9a22c6c7550a6a5b4b93ad398b2cc2c9dfd973f2 [diff] | |
| parent | 0e71890d59dbc793f404e56f47e621272d75d647 [diff] |
[automerger skipped] Merge "Annotate some data classes with @Keep." into main am: 84a49337e4 am: 8eb5c37769 am: 0e71890d59 -s ours am skip reason: Merged-In I21c0298a088092cef148253be3efed65e01a90d2 with SHA-1 cb279f32ed is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2892180 Change-Id: I51c0809e0f15608b953fbdf1c37d040c98166b33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>