diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:22:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:22:22 +0000 |
| commit | 0b3b15456444a1c73798a53d539250680b340de4 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 20be97563f541dd6e07595f782a3a1da58ba86f4 (diff) | |
| parent | 479e4ebae4edf727c7b72a52f27ff8502e000672 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours am: bcd2ea35c0 -s ours
am: 479e4ebae4 -s ours
* commit '479e4ebae4edf727c7b72a52f27ff8502e000672':
Import translations. DO NOT MERGE
Change-Id: I4803b429d05e8545eaa25ac0cce790e664194010
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions