diff options
| author | Geoff Mendal <mendal@google.com> | 2015-10-21 17:02:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 17:02:59 +0000 |
| commit | a948cfe393cb18402b9de54fd5062bada322a70a (patch) | |
| tree | 8f86f5a53ead0787376c4b2f2c31179dc9b0cbe5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f7e27a2dc16cf84aadcfeb0a9c6561b51e175118 (diff) | |
| parent | 762ce0fc448ebd41225ef0600fb5d258de434de7 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 8ba1cdd946 -s ours
am: 762ce0fc44 -s ours
* commit '762ce0fc448ebd41225ef0600fb5d258de434de7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions