diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:48:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:48:05 +0000 |
| commit | ef47878192451d8ae65caa8b479a088c49fbe9d3 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 01261616f00a611709298195f6137cfea3529417 (diff) | |
| parent | 3cddac44fd60e05047aa510b6d4973b47dec0475 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b697973e2a -s ours am: 0291cf7113 -s ours
am: 3cddac44fd -s ours
* commit '3cddac44fd60e05047aa510b6d4973b47dec0475':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions