diff options
| author | Paul Hu <paulhu@google.com> | 2021-02-23 22:30:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:30:01 +0000 |
| commit | 2e268689230a9c3d16e90a8e74f163ad3914b538 (patch) | |
| tree | 490aa301969dfa78f07112b835cabcafa0bd3d6c /services/java/com/android/server/SystemServer.java | |
| parent | f4d45a9d210f6fdb17cc23f5ecf0a2bba56398bf (diff) | |
| parent | 0727d8d08c45de02e118d799efa878950e843ca7 (diff) | |
Merge "Expose NetworkWatchlistManager#getWatchlistConfigHash" am: 7d72edb937 am: 0727d8d08c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569981
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09ae1ef7ad7e45b0870c09f8e20875ffe3714f6c
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions