diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-17 15:53:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 15:53:11 +0000 |
commit | 177d9b9a25296d9cbe0f96497a8abf2fe28aa1da (patch) | |
tree | d7fd0bdd9f37b4c82fa7298cb9260928a21b441e /rs/java/android/renderscript/ScriptIntrinsicResize.java | |
parent | 84f4adc9a5e3cc818ed972dc7fecbafb131a779a (diff) | |
parent | b279f5272e2c7554aeab930ba0aabab12efff9e2 (diff) |
am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'b279f5272e2c7554aeab930ba0aabab12efff9e2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicResize.java')
0 files changed, 0 insertions, 0 deletions