diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-10 01:15:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:15:58 +0000 |
| commit | 85d81898c9ed76fc8ea769ed68a5f8be309bbd8a (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 41ce1f85666b209e0f8e016671457a10233c753e (diff) | |
| parent | 8549538e5bd2f7ac5f968887359dca513d3aa62a (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: a89fc49936 -s ours am: 8549538e5b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751
Change-Id: I7e4c3ae2653ba87762b5121ccbbce49015c809c8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions