diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:41:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:41:04 +0000 |
| commit | db565bd5164c75184588d82f6f16b48715eb4cd3 (patch) | |
| tree | ad8c0dacaef6fbd371ad603b8059a06dc758eb84 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1f851eed00a20cff2b39fba826e77a70ca0eb8bf (diff) | |
| parent | 652af4f8133741752ed3146b7408144b28c45eff (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a007e877f2 -s ours
am: 652af4f813 -s ours
* commit '652af4f8133741752ed3146b7408144b28c45eff':
Import translations. DO NOT MERGE
Change-Id: I7346c446e942b1f57f97d5341cca64f43f2e6489
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions