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