diff options
author | Chiayu Pei <chiayupei@google.com> | 2019-06-24 09:21:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:21:42 -0700 |
commit | 7e825894bd9bb50af11cc4e9225299d6632359a9 (patch) | |
tree | 0d29bd3ec8d2feda7fecab8bead3b12858f123bb /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 2c731e21d045a6a1d21a2d9af708e9d088d9aff7 (diff) | |
parent | 615b6cf5d79c4d5aeec7c6e1b1e22ceefeb4e6f3 (diff) |
Merge "Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c am: 9d75e2fd79" into qt-r1-dev-plus-aosp
am: 615b6cf5d7
Change-Id: I8bcec13e9549487a6f7c9a9e2da2c9f895492a52
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions