diff options
author | Junyu Lai <junyulai@google.com> | 2020-09-14 04:26:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-14 04:26:15 +0000 |
commit | 1183f4a548af64997f12ec386ef7dfa6c573b673 (patch) | |
tree | 5e7087388b8589c2120d350808ffd47dbe44ef9f /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | f72a5498afc540979f9494985d297ae7d66a9740 (diff) | |
parent | 8ea944d77a876a656e79ed615a852425b59c9aee (diff) |
Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614
Change-Id: I4eb9d53d1136ba6e4b9e1fdb884e0920567db2f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions