diff options
| author | Tej Singh <singhtejinder@google.com> | 2021-03-22 10:53:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 10:53:30 +0000 |
| commit | b3db256be15e3a9e73e6b6ffdeaccf53a84a81b0 (patch) | |
| tree | b558a8697c71611db3ea3c9d86fb93a44b93c2d3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3033e82164041542788e6380fce1c9e22e1d50e3 (diff) | |
| parent | 806baa23ba969ab587d6699d52a0b161def4ea7a (diff) | |
[automerger skipped] Merge changes from topic "tej_isolate_protologging" am: d5127dceb0 am: 975acea8a5 am: 806baa23ba -s ours
am skip reason: skip tag Change-Id I24ff96806e417ad4ee89d84f051ea790a416338f with SHA-1 e5cffdb857 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639879
Change-Id: Ibaab71602ed90389843202b05fa5d903aee6745d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions