| commit | fe14d31945b80ca2ab1a5705e80ea8168d2c841f | [log] [tgz] |
|---|---|---|
| author | Quang Luong <qal@google.com> | Wed May 17 19:02:58 2023 +0000 |
| committer | Quang Luong <qal@google.com> | Wed May 17 19:40:50 2023 +0000 |
| tree | d2872090e4fd7bba41af2b2612be791b1d39f8a7 | |
| parent | eecadcdc472ffa868c6f6c34f29a577648c29bdc [diff] | |
| parent | 63c7f9f0aa5482254e53a321458fe3501c79a9c5 [diff] |
[conflict] Merge "Add Soft AP atoms" into udc-dev am: 5d76036cd0 am: 63c7f9f0aa Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/proto_logging/+/22459532 Change-Id: Ie4a7d8fe2ed595a7fe98b1327ec8e11bc0a18869 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>