diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:33 +0000 |
| commit | 6a344dbadc68f7f44dde97a8b8c4b85d27711be2 (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dacc54a86a6aa130b02a84010ccdc72d31191402 (diff) | |
| parent | 85e70101386ea380e29aed12d449f9f89f25d6e1 (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: 1a4d758e13 am: 85e7010138 -s ours
am skip reason: subject contains skip directive
Change-Id: I536cba4beaa800ce56f7856c57a874f269fa0929
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions