diff options
author | Baligh Uddin <baligh@google.com> | 2014-05-01 16:21:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 16:21:50 +0000 |
commit | 1ffec559d04618fbd31eaf972a81c6df324965c1 (patch) | |
tree | c563c877f7f25cced959fd13521114d276e0e648 /rs/java/android/renderscript/ProgramStore.java | |
parent | f8df90fd6a4afffd9ff51a91df55e3a6fd62f67c (diff) | |
parent | bf4927ee0d085fd0c7eaf1221f709811f3be6f4f (diff) |
am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions