| commit | 17048ee0fd613bba969b1538e6f3dc27867e69dc | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Oct 20 04:06:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 20 04:06:49 2023 +0000 |
| tree | 5752af362939af180882264830a225bc86f5bd3b | |
| parent | a484230e9e4a7900a1b7d577361c7d956d9272ab [diff] | |
| parent | 9543d29715c638d32a1b78cb454b30e0f59f38f7 [diff] |
[automerger skipped] Merge "nfc(api): Dependencies to include in framework-nfc" into main am: f661b30d2e am: e24791672a -s ours am: 9543d29715 -s ours am skip reason: Merged-In I6848686b892bec543f977d48e5410af444eb2f7c with SHA-1 869155b835 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798092 Change-Id: Id1020af7c66334d66f3143bdd772e1ead7fd6d9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>