diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:16:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:16:41 +0000 |
| commit | abf457d975e8b7bcd0cfdb91c232b6d3725052ed (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85d81898c9ed76fc8ea769ed68a5f8be309bbd8a (diff) | |
| parent | 7286ea5ca3eda75a03969331af9c35052c6fc264 (diff) | |
Merge "[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: 8d6fe62426 -s ours" into rvc-qpr-dev-plus-aosp am: 7286ea5ca3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751
Change-Id: Ibe6f005e367c2636d1edede69cb118f25d4e8f87
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions