diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-04 01:18:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-04 01:18:19 +0000 |
| commit | 80c619a2c334f7352f1f722656ffe8017f3c25be (patch) | |
| tree | 45267f0ba2453280a5b7333f51518f5fd3650002 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3cf5ae374062fbe6413a48f5605bff187053f5b9 (diff) | |
| parent | a6ae77ab3a59a35756b3505139c145459c67ea3c (diff) | |
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours am: a6ae77ab3a -s ours
am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0faca3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370393
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a95ae59c667ae80047cfb0913a8176ffaed3e37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions