diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:12:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:12:40 +0000 |
| commit | 71f88b4adb8e2cda6d429acef6967f09b1cd0f3e (patch) | |
| tree | 3f7529d6452f80d957ea5996e34e2f1ee397ee44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e577b65d57f518c0b0f6e89e52afde6ba9dae4af (diff) | |
| parent | b8b4aba44f952aa79a52603749fcf51965df1044 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b9f32be79 -s ours" into nyc-mr1-dev-plus-aosp
am: b8b4aba44f -s ours
* commit 'b8b4aba44f952aa79a52603749fcf51965df1044':
Import translations. DO NOT MERGE
Change-Id: I49b846c4fb947beef95cfcfe20ab7ef1be652233
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions