diff options
| author | Bill Yi <byi@google.com> | 2019-09-26 17:39:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-26 17:39:16 -0700 |
| commit | 17af0854250e9d66ff1e06e734cd54b2504b9650 (patch) | |
| tree | 1b233da9bda0ca3f1e78f779d3244a633c40127c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 694506cd2c3196884feb013ac2dc3cae2241c552 (diff) | |
| parent | ad37297b2cb601aeb9a5635c7aed4c337528195b (diff) | |
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE"" into qt-qpr1-dev
am: ad37297b2c -s ours
am skip reason: subject contains skip directive
Change-Id: If0c210a99446b120b51b760242d9a98945037f70
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions