commit | bea56fbe11a8d66ceb3ff112eae0c1ca75a997fd | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 15 07:30:24 2021 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 15 07:30:24 2021 +0000 |
tree | 18763c625af0d298453b343424292364efc5ae3c | |
parent | f6875cc5834a07341920754b0a249f8c51ae855f [diff] | |
parent | ddeb269ca0ff7b6d01e35e5f3f2e2be9a8dde62b [diff] |
Merge changes from topic "connectivitymanager-blockedreason-shim" * changes: Fix CtsNetTestCasesLatestSdk in AOSP. Use the non-API static UserHandle.getUid method in tests. Import ConnectivityManager.BLOCKED_REASON_* from ConstantsShim.