diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 04:58:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 04:58:33 +0000 |
commit | 7ef1786cbf78d877606322b3c744e94de277318b (patch) | |
tree | 999271e5acef206d196c847b6808bb14cb144d23 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c87f3f1a9e2f5d957eca813696c70059c765bd02 (diff) | |
parent | 4f7713741a002d926b061a20469025a69024bd3d (diff) |
Merge changes from topic "am-b4b877c00d8e4bc4b9ce1b6751918a68" into rvc-qpr-dev-plus-aosp
* changes:
Merge changes from topic "am-51bea38065a94d76abed616f0e984613" into rvc-d1-dev-plus-aosp am: ae9e6f1ae4
Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-dev am: 2825fd08f2 am: 26dd609213 am: 4593311b7d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions