diff options
| author | Songchun Fan <schfan@google.com> | 2020-12-09 00:23:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 00:23:45 +0000 |
| commit | cb3efa67c952c77942ec1d79573232576f0e4dbf (patch) | |
| tree | 488c8e6f65a3752a3d1952d3ead46b26a6186955 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | 934cf9fc6a482a6187a267ed099989ffec419e5e (diff) | |
| parent | 0d8b71b18225bc29af86b06f36e0f8209d0d5f56 (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 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: I42e7012ece907e95d3b630bdffa7ef18df9bb1bc
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions