diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:11 +0000 |
| commit | 1818722366df63a6b07a9d51ac258866a75d39bb (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7875c308a3926cc6b6e500371406a55b71cc475f (diff) | |
| parent | c30148fd7979c8eeaa78ff2d5388ea0475dd5b50 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours am: cee788f5bd am: c30148fd79 -s ours
am skip reason: subject contains skip directive
Change-Id: I04cee92c7f3560d6a596683d768d3d9bc85d661c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions