diff options
| author | Bill Yi <byi@google.com> | 2019-06-24 09:18:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:18:31 -0700 |
| commit | 8e2475f30bdd59e6403bae94c0d209775a24ee2c (patch) | |
| tree | 327813f3031b344a0b2c9348147e04e45434625e /rs/java/android/renderscript/ProgramStore.java | |
| parent | 92c52204aeb6b6e085bd1e02752b7d7a4a5d6339 (diff) | |
| parent | 3c78aefb41af5e1a61fc4afad48b054afced28eb (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: c185e17a25 -s ours
am: 3c78aefb41 -s ours
am skip reason: subject contains skip directive
Change-Id: If6618639e9091c3c6cf958215dd8ef9fa2944b6d
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions