diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:51:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:51:53 +0000 |
| commit | 1a4d758e13f5746483b3a78c03df58a16736ba55 (patch) | |
| tree | 649277fd2f3478c87eece21225a9af4ee7574820 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5fc924b41960781b6f7a97d1b67c5140ed8b2040 (diff) | |
| parent | 7681dc175cf900dabf01ea2a667ca4a83347eab2 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-dev am: 133e0a7eea am: 4c05b6281c am: d8c53a1c5e -s ours am: 7681dc175c -s ours
am skip reason: subject contains skip directive
Change-Id: I942303ce75a7da38b24029b1f8792251687fddd2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions