diff options
| author | Bill Yi <byi@google.com> | 2019-10-24 19:20:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-24 19:20:29 -0700 |
| commit | 86c4c20c60a87b03e478bd784d6c0fc0a2dcb503 (patch) | |
| tree | 3432ecf17cece477c8f5736feb6c9b40e1038e1d /rs/java/android/renderscript/ProgramStore.java | |
| parent | 0b619db6ff354fe2320a19c561515a5d734f5416 (diff) | |
| parent | 75166c84266bba4b25d53319911bba196af72c9f (diff) | |
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE"" into qt-qpr1-dev
am: 75166c8426 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2be9e25bb8973b57a619a5a0d3038cb6598bd31
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions