diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:38:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:38:57 +0000 |
commit | b69aaa7f4e3f694b038cc864d60159e16367e785 (patch) | |
tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 3134d7bc86e44b5d5b4d258ba96b8543ab879167 (diff) | |
parent | 6f07745ca60f0a90c104a02538d2309c6ea1ddec (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours am: 98d40c621e -s ours am: 6f07745ca6 -s ours
am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b14d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: Ic1eea41944655bcfee550854bc1179f6d2ab8263
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions