diff options
| author | Songchun Fan <schfan@google.com> | 2020-12-09 00:55:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 00:55:51 +0000 |
| commit | 8e179885441142abfc814b59cb1d0c35be129a09 (patch) | |
| tree | a3534c606c6777421595e1f4ea1ec1d711d47925 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b25a30fbdeaf372a64a0ed4f3a6f5509621b1403 (diff) | |
| parent | 042b06f0b18fc7fd0efea28eac3c69210776753b (diff) | |
[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-dev am: 1a96cae421 -s ours am: e8630b7a20 -s ours am: 0d8b71b182 -s ours am: 042b06f0b1 -s ours
am skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 edeb081ad8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13179042
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ba3fbc0b6ca129a31c43bd2c0902fb19480fea0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions