diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-12 12:27:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-12 12:27:45 +0000 |
| commit | fb1e519115747baa2de92559a9ae5ef062a14e91 (patch) | |
| tree | 351933c5eac13572fe3ac51544e058b8fdf838ce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 34529139fdf1773bbc8c5505cd2c6871c6adddfd (diff) | |
| parent | ab11735e42f1dc5d3658565c2a52d9f193ee9e84 (diff) | |
Merge changes from topic "am-12a93de0fb82435abb9d75e12bd1113c"
* changes:
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 912dc1511c -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: b0d222b4a1 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions