diff options
author | Zhanglong Xia <zhanglongxia@google.com> | 2023-12-08 20:31:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-08 20:31:50 +0000 |
commit | 488f2e622f26166a973effcec2107f371512b072 (patch) | |
tree | 98817912baa7ff9079fd3c922a3a0aef6b86ac53 | |
parent | 736c8e541b908229c6cd1f48d3291412506d98cc (diff) | |
parent | 855f3d96569e00b664e0e21d077433d4ee0e1e6a (diff) | |
download | openthread-488f2e622f26166a973effcec2107f371512b072.tar.gz |
Merge "update the Android.bp and fix conflicts" am: 82fa1b7e78 am: 9fefae928c am: 2cb0c430c2 am: 27cd0d6b6d am: 61be00dce5 am: eafa32fea2 am: 855f3d9656
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/openthread/+/23241021
Change-Id: Ibcf96d7dc3b85f753968cb8a7818740c28c1efb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions