summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-12-09 00:18:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-09 00:18:12 +0000
commit0d8b71b18225bc29af86b06f36e0f8209d0d5f56 (patch)
tree6885f176aa797dd92e1286f715fcc50316950a1f /tools/aapt2/java/JavaClassGenerator.cpp
parentf03c563ea76425d066a925dcded2d3000d84ae14 (diff)
parente8630b7a200f1fc1f05c6b371f8b577745a82664 (diff)
[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-dev am: 1a96cae421 -s ours am: e8630b7a20 -s ours
am skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 3d79b643d4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13179042 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c9a03111e0a3ccd7a0a3ca499c0eb8d146e111d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions