diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:13:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:13:38 +0000 |
| commit | 54de3ec25b309f51f4a05438fd0089d713cd5309 (patch) | |
| tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 /rs/java/android/renderscript/ProgramRaster.java | |
| parent | 7d23619918eab43e6a54d9f780a0610e6e237ec3 (diff) | |
| parent | 72edb1b78d0316055b40931138ee75a99766995d (diff) | |
am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '72edb1b78d0316055b40931138ee75a99766995d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions