diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 04:31:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 04:31:25 +0000 |
| commit | 83a492f1fbfaf23f6ba610f8d6505c661c9c0449 (patch) | |
| tree | ef82bd77d78541870c25d742e5bcd37739adb038 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a7c111bf78710282ca35068bfb05c45c3cda5b93 (diff) | |
| parent | 7f902e44bfc19c0024775688669336cc1f5eb99a (diff) | |
[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours am: 7f902e44bf -s ours
am skip reason: subject contains skip directive
Change-Id: Ifdd6d655de499c5e64f59e7ae0ca9ae2fad62e62
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions