diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 06:30:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 06:30:14 -0700 |
| commit | 18c62f1ae657b8b1c45750e9d9feb5897b06bb45 (patch) | |
| tree | 6b003e29fab65a82d119f995753c8fec467cf0cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bfb6a05d6ffaeddbdddb9928c8c8717be0941fad (diff) | |
| parent | c5252e3523be56da5050d9359258b94de9118ddc (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e2529357e8 -s ours
am: c5252e3523 -s ours
am skip reason: subject contains skip directive
Change-Id: Id991a9063f46c83efe08ae84d2a4b904cba7b725
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions