diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:33:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:33:18 +0000 |
| commit | e316fc0577a1a4f8cd08c50b5c2e56d866a13983 (patch) | |
| tree | 074c46a2df891fd4260fcf8a720a9128810b99d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 998797a27d026a0b79dc1fd1fcb6004a35799228 (diff) | |
| parent | f9a6f33091772b847cf1580021530cdf5004c035 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f9a6f33091 -s ours
* commit 'f9a6f33091772b847cf1580021530cdf5004c035':
Import translations. DO NOT MERGE
Change-Id: Id0b2e17995055d8d92b2e3f0d6a81e4a41fa55cb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions