diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-03 10:55:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-03 10:55:28 +0000 |
| commit | 9c13d78862ff07b2f7664d578c6fa5b28c2e6d58 (patch) | |
| tree | 641a0af5705f796d9d6b176125935a5c0ba3cbcd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aefec202de2a94ce2a624d72bd2036f7141b1af7 (diff) | |
| parent | e34c4f77d156beaf1469daba03f15d654a85f531 (diff) | |
Merge "OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: d73c6eb6f3" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions