diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 19:04:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-12 19:04:02 +0000 |
| commit | 223c27ef69c3c41b60971142fc2b9479f8167bcc (patch) | |
| tree | 7a24d45e01375d0cf7777f8e63e2135b0927e152 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 30416b5b7919167172d82e6dd015ea84ecadd76a (diff) | |
| parent | 050d6c11d5d20a0cb306aa3a87a48f48f6da60de (diff) | |
[automerger skipped] Merge "NetworkRequest: Embed requestor uid & packageName" am: 9dd718c5d9 am: 894c9db9f5 am: 050d6c11d5 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 e38acab53e is in history
Change-Id: Ie84d552bda61e5f3e5e1000eb6496a5d5da165b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions