summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-02-04 01:18:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 01:18:00 +0000
commit3cf5ae374062fbe6413a48f5605bff187053f5b9 (patch)
tree45267f0ba2453280a5b7333f51518f5fd3650002 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd50796a29fe188c2e4a9ac0edb44072a481a6667 (diff)
parent8541040e267e7fe2dc155324493b4a31b4db7d62 (diff)
[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74fb1 am: 8541040e26 -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/+/13369913 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9a56b46612cf50a7f087b6b83e6998dcb1f4e38c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions