diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-01-25 23:17:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-25 23:17:31 +0000 |
| commit | ece99d6601bcdc89773319eaca6541e5bfe85be0 (patch) | |
| tree | cddcc3e030137a8f1fd5e16a339b31f34fade1bd /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | 7bd1ae6af0f6a64ff2d7acdb4c91cd35084a6e55 (diff) | |
| parent | 1e9b3172bc64cf0c40b06c0741fa41189beac96d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours skipped: d855899adb am: 350fc5d06a -s ours am: 02ee278871 -s ours
am: 1e9b3172bc -s ours
Change-Id: Idd53800a33435dcff27f6bc904349560dea039cd
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
0 files changed, 0 insertions, 0 deletions