diff options
| author | Eric Laurent <elaurent@google.com> | 2020-12-22 17:38:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 17:38:50 +0000 |
| commit | c407689f12d96ddb25ca580ad3a0f7bb0608d895 (patch) | |
| tree | 15dc93cc5533bbef78b6ae716a90f52008ac4790 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b85dd50694813b6798db2a5f0e47a718acb1de08 (diff) | |
| parent | 6bacac852af55792d7cbfc2fc4118f6f0c7b0c69 (diff) | |
[automerger skipped] Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d am: 6bacac852a -s ours
am skip reason: Change-Id I2ba02c6b50af80846a25010ead05c4ae364868de with SHA-1 f40141ddbc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534429
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0e37c319c3099aefc84c6a0094bfb1828c013ad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions