diff options
author | fionaxu <fionaxu@google.com> | 2017-09-06 04:11:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-06 04:11:02 +0000 |
commit | bd1a71613547e894b37ddd2582a31062c7278cc9 (patch) | |
tree | 187794e80e1aaf5a463bb2fd2aef3b32eee355cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f3bd8a9a3fbca4f5661b4ec1b5fdf74b5ba52bf6 (diff) | |
parent | 5bed401148fdb4b04690cbca481e239e64176d5c (diff) |
Merge "disable carrier actions on redirection by default" into oc-mr1-dev
am: 5bed401148
Change-Id: Ie7fc58959699716fc3bd25dfa67a9f1567452009
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions