diff options
author | Songchun Fan <schfan@google.com> | 2020-12-09 01:04:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 01:04:39 +0000 |
commit | 59855d226a7dc25cf5b833d55e7c7c9e76d48779 (patch) | |
tree | a61be1ff88eb4581a06b46a947198bb3e4ff2670 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 71726e363ab30bfab8cfb09be764d758fb51352a (diff) | |
parent | d852f17eeb6d597d346ad5cdd537201997e4faa6 (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: d852f17eeb -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: Ice495bbd4dbacd16767fd1a858bc7bbf6e98aaaf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions