diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-09 20:22:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-09 20:22:21 +0000 |
commit | 1f04d4918166969e04f647714c416e090b1ef639 (patch) | |
tree | cbf5bbd272644d161f03ac3d150b4532172b62cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0fd9139d71b3b714bc59763fdab0ef046716a3a1 (diff) | |
parent | 32386a7304d3e3bb6cc247dc20ffcd2523411209 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9dbd07ef32 -s ours am: 0d1606949c -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions