commit | 0a6d7c0d204dcd3c67232841bbd442956322c5af | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Fri Jun 04 12:25:59 2021 +0900 |
committer | Remi NGUYEN VAN <reminv@google.com> | Fri Jun 04 12:26:31 2021 +0900 |
tree | 9d686e46cc303175590048fc02d90fbff913c4b6 | |
parent | 17bd6bfca176343c6fcbb2e8abbe010d53434587 [diff] | |
parent | 689b08d86d4c4991dd1cca794b291581bb3b4b51 [diff] |
Skip merge of "Merge fixed history of Connectivity" This merges commit 689b08d86d4c4991dd1cca794b291581bb3b4b51 with "-s ours". Bug: 186628461 Test: TH Ignore-AOSP-First: per-branch merges Merged-In: I3e3de8eaa14a44cfea00bc2e56fd1cbe2bb657dc Change-Id: I60f8b7e5011b6cc07212f45df5a6a1d83405488d