diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:59:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:59:08 +0000 |
| commit | b67c0f56dde08c9064ba48490212571713124184 (patch) | |
| tree | 83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55311a446b70ce70c8880fc619caa3b9077ac62a (diff) | |
| parent | 57ac383a3d2596037a31daa9a26b72af696809ae (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 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: I2eb6dc1884cf186a47f895771dc48ea9d202cec9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions