diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-23 12:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 12:55:52 +0000 |
| commit | 4d17b9549e0223b1efb2b66cf71e36b7a56420ee (patch) | |
| tree | cbc32143153a4da2c551b17d767a5207d2d564d1 /rs/java/android/renderscript/RenderScript.java | |
| parent | 583c7c569b7cdf7d334ead83e45fbc67bb2c7313 (diff) | |
| parent | 2f12b803e913117edbed7a9409f04b1d00686eba (diff) | |
am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE
* commit '2f12b803e913117edbed7a9409f04b1d00686eba':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions