tree 08a900eda0fa8939db8f927cd08cfb3affae0b51
parent 83094ae5f5f8842c517f99431d1be7f65ad27b3c
parent 06a9068901f5038f2450a98fde37a84caf06186c
author TreeHugger Robot <treehugger-gerrit@google.com> 1654568251 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1654568251 +0000

Merge changes If53d59b6,Ice2ec28f into tm-dev

* changes:
  Fix UUID issue of address consolidateion
  Do not consolidate pure LE device