summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2020-12-09 00:55:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-09 00:55:36 +0000
commitb25a30fbdeaf372a64a0ed4f3a6f5509621b1403 (patch)
treea3534c606c6777421595e1f4ea1ec1d711d47925 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent31f80d1c6f1b00f960584ce36288e87a42f1c0d3 (diff)
parentc3ee25082ae67b1e1563bdd3d779eb4130085e85 (diff)
[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-qpr1-dev am: fd6e352d42 -s ours am: f03c563ea7 -s ours am: c3ee25082a -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: Ib4468269fc7b5327a5049fff8d51300fb8eb2862
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions