summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-12-09 00:48:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-09 00:48:06 +0000
commitd852f17eeb6d597d346ad5cdd537201997e4faa6 (patch)
treea839aba5fee5159141abe11f77032a84e6b1a74d /tools/aapt2/java/JavaClassGenerator.cpp
parentcad5f6492c87ae3aa760c295721c7e22a715ad48 (diff)
parentcb3efa67c952c77942ec1d79573232576f0e4dbf (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: cb3efa67c9 -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: I03e3a616b87ed09e98c72782ea2b7a3fb9ee602d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions