diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:45:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:13 +0000 |
commit | ce5b85b814661a73b9f9ab268598628d2b839a8a (patch) | |
tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 841942cbbea54a904523d1203401e1f5eb129296 (diff) | |
parent | b69aaa7f4e3f694b038cc864d60159e16367e785 (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: b69aaa7f4e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: I559df65ccee1da0eee4516926f5edf03c59cbcb2
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions