diff options
author | Bill Yi <byi@google.com> | 2019-07-03 17:46:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-03 17:46:10 -0700 |
commit | ba533cba21deeb017ef822a504a18a7fdf54416e (patch) | |
tree | bf51fbc4420450b16148c26f1c942abda4665e2d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 991320b99146140d770ce55bf810786512796b79 (diff) | |
parent | 549900c29ab0317b2c84838711acd0a5c87f4d6a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: f6313c9dc7 -s ours
am: 549900c29a -s ours
am skip reason: subject contains skip directive
Change-Id: Ib6060797a7a6b20545e2ab4a6c32f47570135180
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions