tree 5a7bed38d2c21da72df6647a013d978279d80165
parent ee996f49f2d7ab97e4e04ab0c083e9238b902da7
parent f8bc783c2fb469dd86639a41cc7c7df6a8e79677
author Parag Dixit <paragdixit@google.com> 1616660233 -0700
committer Parag Dixit <paragdixit@google.com> 1617068285 -0700

Merge remote-tracking branch 'origin/upstream/main'

Updated to commit: f8bc783c2fb469dd86639a41cc7c7df6a8e79677

Additionally, resolved merge conflict for openthread-config-android.h
and also updated ot_version.gni to indicate new version for
soft-transition.

Also changed compilation flags to compile for THREAD_VERSION_1_1 so
that it works with current RCP firmware.

Bug: 73064

Change-Id: I4ff3f0159f0ba46c3d7012e9041fdcd92d9236a7