diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-02-13 20:28:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-13 20:28:51 +0000 |
| commit | 5ea7cd28fb8d2072da7134851f7360830f1321c8 (patch) | |
| tree | 69e5222359b742d99d33cd4b6ab1237400ee9a73 /tests/net/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 3313688ba5dc1784ac8d655f58a0b212c912e4a1 (diff) | |
| parent | a9f241bb437bfc4542a4ee3a5da65014eb5b510c (diff) | |
[automerger skipped] Merge "add MANAGE_CREDENTIALS appop" am: c9a8b2fa8e am: a9f241bb43 -s ours
am skip reason: skipped by user rubinxu
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587046
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifcd777eb7f52719d447333a2fa1710f3338c01af
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
0 files changed, 0 insertions, 0 deletions