diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:28:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:28:12 +0000 |
| commit | f8e573fff3a329b83e5d934c2b4896ef47765110 (patch) | |
| tree | 83316e2a47326cd5ee26bdb4bc9cf1b647c78a54 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e84b783bf4350772879b5c4bb747a59b7d86b529 (diff) | |
| parent | fc7b7755cab992e670ab92e40a9078c385a44458 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into qt-qpr1-dev am: f228451841 -s ours am: fc7b7755ca -s ours
am skip reason: Change-Id I1241a12eafa0bdbac59a8ddd4cf6a0637d467b19 with SHA-1 1ba154b14d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: I67f4c33bf86f621a1065af9aa43df8edf9286906
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions