diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:27:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:27:32 +0000 |
| commit | 12e7baaddc650e5a9deca415091c1592cc5224fd (patch) | |
| tree | 229caccbdaef1c0ad45dda7e7994d2ea77370e90 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ade9bc9a97330d90164a5c7d9371afd0b1f0dfc1 (diff) | |
| parent | 1a673296ae4f700d45d0b66111ed3f4d60deb47c (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768751
Change-Id: I2d2664ed6d9fe35377df0c283a9a14e931c25128
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions