diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:50 +0000 |
| commit | 2fe87534dd2fec58c2efd0cbe088245fe4ed1b5b (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 165784c49ed33f18e096fb180d8d622bb8fc2bbd (diff) | |
| parent | 81a108d038245c756025f5ed439d02cbd71d685d (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours
am: 81a108d038 -s ours
* commit '81a108d038245c756025f5ed439d02cbd71d685d':
Import translations. DO NOT MERGE
Change-Id: I3f0bd2c2991404c5132ec5ab07e9ce184a0f9695
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions