diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 19:39:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 19:39:34 +0000 |
| commit | a098b374d0a9a2a51fa60c7864174a89d050eefb (patch) | |
| tree | db123fc3f028d65464b0d1fdbf59207786dc3aa0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9136f4f6ce11f617ff2047faae7fca23ff275af3 (diff) | |
| parent | 2f09a29ad7c83e94ca357e28ce75ceb4b3d6b183 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8ad820ef54 -s ours
am: 2f09a29ad7 -s ours
* commit '2f09a29ad7c83e94ca357e28ce75ceb4b3d6b183':
Import translations. DO NOT MERGE
Change-Id: I738435eb28c1a676d6791aea2da7107039180421
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions