diff options
| author | Songchun Fan <schfan@google.com> | 2020-12-09 01:36:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 01:36:41 +0000 |
| commit | 800ad02cdc5a4aa4ad7f6bab6a9af3eb1a8d8eb3 (patch) | |
| tree | a8cea50f0382315ac6cb5829955714051342d372 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 606fdbc4457994b54a775b8518ab607d9ba27492 (diff) | |
| parent | 59855d226a7dc25cf5b833d55e7c7c9e76d48779 (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: 59855d226a -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: I76a45b2fcd986a5dbe1f042ecaad70efec8a2e03
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions