diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:46:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:46:23 +0000 |
| commit | db89f18c90a8b0b50d6a860d070af051e34ab530 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6bc61cad81b09c7abf8cd23e807068e42e697214 (diff) | |
| parent | 1fb156703750f6d0420c0c20192a44168da24c4c (diff) | |
Merge "[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into pi-dev am: ade9bc9a97 -s ours am: 8df04e3975 -s ours am: dc9d907b8f -s ours am: a82898ba34 -s ours am: 66a1743631 -s ours am: c66d66a32d -s ours" into rvc-qpr-dev-plus-aosp am: 1fb1567037 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: I8f2ace57ff1e798508459a3749a2d3106c885bfe
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions