diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 04:28:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 04:28:07 +0000 |
| commit | ae9e6f1ae4bd169183ae5c0229196a55fe9c853d (patch) | |
| tree | faa2874e67fc4d971e2d00a7a5515aa1f0596076 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 75e998cf224ae6adf1918badc4417594b957a54c (diff) | |
| parent | 4593311b7d670dbec1926c0a3d44940862a5dfdf (diff) | |
Merge changes from topic "am-51bea38065a94d76abed616f0e984613" into rvc-d1-dev-plus-aosp
* changes:
Merge "[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display" into rvc-dev am: 2825fd08f2 am: 26dd609213
[RESTRICT AUTOMERGE] Update the visibility of activities on sleeping display am: 1e8e7a9487 am: a7973cb8fc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions