diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:21 +0000 |
| commit | aec1836f4ceb35e4f10adac80b7bc0cbaabbc540 (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1818722366df63a6b07a9d51ac258866a75d39bb (diff) | |
| parent | dfe83c35208641248a93309d52e9e3c4a1cd0794 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours am: 72cb065b97 -s ours am: 43e857c5c2 am: dfe83c3520 -s ours
am skip reason: subject contains skip directive
Change-Id: I478af452abd4ef5bea3cabf150aab8ff09ae7769
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions