diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-03 00:38:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 00:38:08 +0000 |
| commit | cb67204b6e9f3163bf00d91ad24f62cbde304493 (patch) | |
| tree | 5f55550de17a1c2de9bd711eb135ccc55dde35f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e2698b2e6f07c5eefb2c9ac2a0a7d150631e15e9 (diff) | |
| parent | a588a437c2872c0d7d6a3be646f5affd63c355ab (diff) | |
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -s ours am: 21aa3adb81 -s ours am: a588a437c2 -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: I8ade0c7f02efe85fd53426ce05229247dffdf439
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions