diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:10:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:10:37 +0000 |
| commit | 1413c3c4c47fba261f5f708a4a06479db9946e1b (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b6e6858b48ce8732c4ddf6f8ecd3a21e654424f2 (diff) | |
| parent | fe399658d87c045069d4543bd0af77896a511aa6 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Allows the Assistant to request suppression of fling" into qt-qpr1-dev am: fe399658d8 -s ours
am skip reason: subject contains skip directive
Change-Id: I040bac7bae2bee3334fd5a433a042009aa1b85ec
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions