diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-02 23:29:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-02 23:29:48 +0000 |
| commit | a6ae77ab3a59a35756b3505139c145459c67ea3c (patch) | |
| tree | 8dd94dcb5a1ab53b3ae372bd56e70f2f01ac78c4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8541040e267e7fe2dc155324493b4a31b4db7d62 (diff) | |
| parent | 45faf04f53f64226cc45465d7d6a70a4da4adb54 (diff) | |
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309ffc -s ours am: 45faf04f53 -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: I7e69bfe6f9f7826f277875d729830e4009372470
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions