diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:36:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-10 02:36:52 +0000 |
| commit | e0035f0dab7351189e6a5275957dfd4460373dd0 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e407ef9cb6419870fc7965981e16b03f12247f4 (diff) | |
| parent | bb6c756ff5b4d6c5de0d69ea098c08c02b23345b (diff) | |
Merge changes from topic "am-b1be03bda51148b4a765c48e0da0ffbc" into rvc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE Check fingerprint client against top activity in auth callback" into oc-dev am: 4cf0088dee am: a10d4f4317 -s ours am: e422433ae5 -s ours am: 62a47dcb08 -s ours am: d2cf9d9d8b -s ours am: 77579a973b -s ours am: e65d59eb5f -s ours am: 343b788472 -s ours am: 5ba661a139 -s ours
[automerger skipped] DO NOT MERGE Check fingerprint client against top activity in auth callback am: bb5706541d am: bfd504c81a -s ours am: efa94e557f -s ours am: 6e185d5cad -s ours am: fd1f963c32 -s ours am: 8f077190bd -s ours am: beda396d64 -s ours am: ac318c815c -s ours am: fd72b7c39f -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions