diff options
author | Jorim Jaggi <jjaggi@google.com> | 2019-05-10 18:16:21 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-10 18:16:21 -0700 |
commit | 8421308ad12cef9795b38faf41f1ec2f2e29a9e2 (patch) | |
tree | fc5e7cfb0e0a50e86e685feeb49008386211d888 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 27657de6595c62c570666ee1e90260f7a0d574f4 (diff) | |
parent | bee66a362c6640b9b0a2414853596b4d76c2e90d (diff) |
Merge "Don't take activity options that contain remote animation" into qt-dev
am: bee66a362c
Change-Id: Ieda0cf593381bb27587895384849a3fac1e38e50
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions