summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-02-04 01:18:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 01:18:37 +0000
commit34670f7af0f01dec61b65076accfdf59fffdd6f5 (patch)
tree45267f0ba2453280a5b7333f51518f5fd3650002 /tools/aapt2/java/JavaClassGenerator.cpp
parent80c619a2c334f7352f1f722656ffe8017f3c25be (diff)
parent57f2f3fedd994666d461e928f79170fa729797e4 (diff)
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beba3 -s ours am: 146953dfff -s ours am: 0debf904b1 -s ours am: 57f2f3fedd -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/+/13370383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9208638d65c4ae6acd05bcc319b84771d0337ee2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions