diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-12 15:53:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 15:53:38 +0000 |
commit | d0d0fea3d6b032c460dc26e5b250b61bed88718c (patch) | |
tree | 6d11e7bff6288c99dc618666047f09625ec4dde5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 028ad8d498be62a6a0884b81533d25571596b486 (diff) | |
parent | 89a94b706df307c5c7032c81b79a4f79ca3d1d6c (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am: 89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions