diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-01 21:20:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-01 21:20:11 +0000 |
| commit | 6ee840509ab854449ff95556cdf53d6dc6a18749 (patch) | |
| tree | f197d3d00247699bd028edf8d3b927d223c54352 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f8a1c9121dae665ec9dc29484f89adfb5f3f0886 (diff) | |
| parent | 8cc5899aef3ab8e1ad35d6882a082416aea734ed (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 60e392e021 -s ours
am: 8cc5899aef -s ours
* commit '8cc5899aef3ab8e1ad35d6882a082416aea734ed':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions