commit | fc71616a48edd9d40cb468f3b670d45ea702e2a4 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Mar 05 05:18:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 05:18:27 2021 +0000 |
tree | 9b61b98b58a1652518b348bf805dbca6a9862ac5 | |
parent | 03297aacc6658191c93dc3009951c0da0e79c076 [diff] | |
parent | 547c982b975f4e4d3a3f075602ef67544b8c7e26 [diff] |
Merge "Fix CaptivePortalTest before R" am: 41dd05fdfb am: 547c982b97 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib5bf1fc2b06fb5339ffd9b43d0eda893a4bbc4bd