diff options
author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:38:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:38:49 +0000 |
commit | 8fcc7fb7627b0620327f75e7bd5fe0c1dee06623 (patch) | |
tree | b7f99b81bdfb768a4e4f8cf8bab74676b6d5addf /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | dc9d907b8f69d11b469d595d207b2e55365c9143 (diff) | |
parent | 50472c1db24f7435c875857888d66665c73a6635 (diff) |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-mr1-dev am: 1a673296ae -s ours am: 12e7baaddc -s ours am: 50472c1db2 -s ours
am skip reason: Change-Id If5cdf8ffaf3aa7d8a1ac81272e3bfb2cc7cdddf1 with SHA-1 d4774f9101 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751
Change-Id: Iad87da850355f7cafc81ad1fed094641e2bb9547
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions