diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-30 16:32:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-30 16:32:37 +0000 |
| commit | 8413638d9ce44d3fadd3b61c7afccc146fd890e2 (patch) | |
| tree | 030e2cf5f6c2ae73cac39cd18c90c3b1eacc1559 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5382338e7430fdc0d6eec27d08005f1150d24543 (diff) | |
| parent | d0a66f16bdacefe29c8c46bc26d3b67e5ee39e38 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3e2b79aa28 -s ours am: d0a66f16bd -s ours
am skip reason: subject contains skip directive
Change-Id: I697f8510602b7e4cabd6cd7ebae482f12659231d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions