diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:47:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:47:19 +0000 |
| commit | 3ebaad687bf002fd8753f8ab29955f311c4abf36 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c8445be03006d9c480d1a41af1c564f6e1d6ccd8 (diff) | |
| parent | 9850a02a0a358f0e9e88a460914bc0d6e9205bcc (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: 98d40c621e -s ours am: e92bc73b56 -s ours am: 9850a02a0a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12754868
Change-Id: I4ac7ae61946b6182d139f0ce128ad87d25447b03
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions