diff options
| author | Curtis Belmonte <curtislb@google.com> | 2020-11-09 23:32:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:32:25 +0000 |
| commit | c66d66a32dd5097baa7adf3a5a4b236e34652509 (patch) | |
| tree | da4cb2ad6c93805a36fe545bcac688babc18c18e /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4eaf2171706ec3234b7e009fc8af66ce2122bcff (diff) | |
| parent | 66a1743631710ef9c9b566e73d9f237095666fbd (diff) | |
[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 skip reason: Change-Id Iee6af379515385777984da55048c1efd9339ed88 with SHA-1 be924dac10 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12768177
Change-Id: Ia85de38d53a6a60ac57b57c92395e7d495e80d5e
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions