diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-05-21 02:22:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-21 02:22:56 -0700 |
| commit | eb52444687dc509be6a1b24b42d6c4191d0adf38 (patch) | |
| tree | 2e6e03c088f47f24a34789619769920bbef5940e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 32e9961893b3ec54ca8987d42d522fed8c1470e6 (diff) | |
| parent | 58d86b3633c9e1cbefe9dcfe54d8d0d0f046a24d (diff) | |
[automerger skipped] Merge "Do not mark in-process NetworkStack as persistent" am: 67245262ef am: fe90d71cb3 -s ours
am: 58d86b3633 -s ours
am skip reason: change_id I0eb896c825ffe2581950c0bdd2b31ebd7eae0982 with SHA1 a95544d9a8 is in history
Change-Id: I69c69c614907a41f1a0c9bd0dc1595678e031350
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions