diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:13:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:13:16 +0000 |
| commit | 36227b716d6712536acff8158a8cb3e812608fd5 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 065a39e95dd8a2ec5cb373ce47e80042e8e032a3 (diff) | |
| parent | 1c568804d4764ff1b48baf7e50edce69b7ac6726 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e30eb8b3ba -s ours
am: 1c568804d4 -s ours
* commit '1c568804d4764ff1b48baf7e50edce69b7ac6726':
Import translations. DO NOT MERGE
Change-Id: I0fad0b2ed5a999c0b0e4925d27e091610762d591
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions