summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-12-09 00:47:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-09 00:47:58 +0000
commitcad5f6492c87ae3aa760c295721c7e22a715ad48 (patch)
treea839aba5fee5159141abe11f77032a84e6b1a74d /tools/aapt2/java/JavaClassGenerator.cpp
parent744efca3e0d34bf3b8c9dd4e667ebf18dfb4deda (diff)
parent934cf9fc6a482a6187a267ed099989ffec419e5e (diff)
[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-qpr1-dev am: fd6e352d42 -s ours am: f03c563ea7 -s ours am: 934cf9fc6a -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/+/13178485 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I16e95f9c82c787b684524c21b02db0236c512091
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions