| commit | 2a9e63cf8e09b1a7a2ccf353a0bf62df3ff1023e | [log] [tgz] |
|---|---|---|
| author | Henri Chataing <henrichataing@google.com> | Wed Feb 22 19:35:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 22 19:35:45 2023 +0000 |
| tree | c671571ef2a55f1137f19f9d1dc91720efba2c3b | |
| parent | e90e7bdc63fda29ecf42a0addd8140f3acc7bdd7 [diff] | |
| parent | a71d6f1e63ad067b92e16c54882f802e68613cb8 [diff] |
[automerger skipped] Merge "Add new enums for NFC developer options" am: c49599f2bf am: c19c8ec6bb am: a71d6f1e63 -s ours am skip reason: Merged-In Ibd72537eea6cd2a90113696bfa7f173b240cbcdb with SHA-1 bd2b26bc1e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/proto_logging/+/2331785 Change-Id: I49867fd973b8b1e67f952937560b4327d1b57299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>