diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 10:46:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 10:46:12 +0000 |
| commit | 10f14e41be559261c27b056234efc736f88cefd9 (patch) | |
| tree | 077c02535c6062ba3b65b5df3067df0d20d21f9a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 51f11f9b0bef2cdc14d961aa03d01472d199e4cd (diff) | |
| parent | 66794f915fb6c3dfd04ef928de0ec3034ebb242c (diff) | |
[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: 66794f915f -s ours
am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 7dc302d612 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646326
Change-Id: I19a6e876187a5cf64a00c3f2dac15c8bec8f2911
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions