diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:04:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:04:06 +0000 |
| commit | 8c14e3ad910939c0cf36796d86a9729dd132e956 (patch) | |
| tree | f18b4f23760535840cf3c0410eb17d186883dd01 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 35d17c30e1aac0685514592f9fa5173bc4a1aa9d (diff) | |
| parent | 1a49e73d2a222b9d74381651f44cb57f040b2163 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours
am: 1a49e73d2a -s ours
* commit '1a49e73d2a222b9d74381651f44cb57f040b2163':
Import translations. DO NOT MERGE
Change-Id: Id3d70f4a031896490a40c395f882f626719b54d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions