diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 09:25:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 09:25:15 +0000 |
| commit | 659a589647076ef92fc5336f270f6f24a59304ff (patch) | |
| tree | 6e0a7ff8d47779db3d913d373219a6fb7228d830 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3e04f5af272c7022b51896e4d088fe8917cece7a (diff) | |
| parent | 75f4c6c49ac0832725328be79f19c8e98f33ed46 (diff) | |
[automerger skipped] Merge "Use Context.NETWORK_POLICY_SERVICE to get network policy service" am: 0daef81444 am: 6c76e04450 am: 75f4c6c49a -s ours
am skip reason: Change-Id I41bc1cce08f81e2d822250f2d620bff7afe4329b with SHA-1 7e96360554 is in history
Change-Id: I89b2c99f4bfe71e01b97d6d082da6d9fad3f1194
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions