diff options
| author | Bill Yi <byi@google.com> | 2019-01-19 07:44:59 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-19 07:44:59 -0800 |
| commit | bd1f8940d603766ce308b694554f47de0ba78d92 (patch) | |
| tree | db2c9c6cc1cdcec28b762487bcf9f902ad29e73a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ec3ce5769871b94c8bbbcf61cb4ffd88a6d11211 (diff) | |
| parent | fccf9d031f94208fbbedf31d143ec51435522bab (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: fccf9d031f -s ours
am skip reason: subject contains skip directive
Change-Id: I4b66bd86ad4e12f743eefebf9b25e0f7115829fc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions