diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 00:16:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 00:16:24 +0000 |
| commit | 8d6fe62426ceafd7dea6c0d1c661099332f0971d (patch) | |
| tree | da4cb2ad6c93805a36fe545bcac688babc18c18e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c66d66a32dd5097baa7adf3a5a4b236e34652509 (diff) | |
| parent | 39d75b0e54199b928e294db6643b90535d20629e (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: 8fcc7fb762 -s ours am: 57ac383a3d -s ours am: 39d75b0e54 -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: I3fb5c783388218ef762dcd27e09f4f108bfa47da
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions