diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:14:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:14:15 +0000 |
| commit | 88fdea080fd9aa1ac2c31a8a2cb0ace3a0be924d (patch) | |
| tree | d51216441031bd8cc13180279d593835fa7287f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | abd7b12ada0f5f1c61ef9cec2ca13e199d6b2682 (diff) | |
| parent | f79616b4277f477985f96f8a486126a389905c7d (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f79616b427 -s ours
* commit 'f79616b4277f477985f96f8a486126a389905c7d':
Import translations. DO NOT MERGE
Change-Id: I35c307deac6f9b0fc01102841cd567a0ec2e4b6f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions