diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:13:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:13:05 +0000 |
| commit | 9d36d8eab3b4fb6f37b515d3bd0500ba1a489068 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 57ea9d02e58038cae2ad43390736c7047bf3d32a (diff) | |
| parent | b53c4e68ece0086c9089a29051a32b7ec260efeb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4233404ee4 -s ours
am: b53c4e68ec -s ours
* commit 'b53c4e68ece0086c9089a29051a32b7ec260efeb':
Import translations. DO NOT MERGE
Change-Id: I4d4eb4dd2ff30b16886b4c83330921b3b1ea1495
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions