diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:48 +0000 |
| commit | 165784c49ed33f18e096fb180d8d622bb8fc2bbd (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18f07fd061e33310354217b33fa83abc0e94ce57 (diff) | |
| parent | 498f780f42d39906ef634abada86eb750ce24fbb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2 -s ours
am: 498f780f42 -s ours
* commit '498f780f42d39906ef634abada86eb750ce24fbb':
Import translations. DO NOT MERGE
Change-Id: I337ee1c7c33a89158126caa18813642e954229e5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions