diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 01:19:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 01:19:31 +0000 |
| commit | 7f902e44bfc19c0024775688669336cc1f5eb99a (patch) | |
| tree | ec4af35f27445fdd47be62c98d3e2db3a73813bc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1b09d67b51b411f8210a851bd2bfbe5d411886da (diff) | |
| parent | be37378755f571f248f7197061dd3e619ca8a4c2 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: RELAND: NetworkRequest: Embed requestor uid & packageName" into stage-aosp-master am: be37378755 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 3e63df535a is in history
Change-Id: Iac17ca3df5826eb235fbc7ef02c0a5de4f06f44e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions