diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-15 22:35:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 22:35:47 +0000 |
| commit | fc5f24d874e36d9e2bb73b21e6ed7fcac0e1d80c (patch) | |
| tree | 94f6d08290ab11bcf9cb897270fd3577fd9cdaf6 /rs/java/android/renderscript/ProgramStore.java | |
| parent | bd42c307c4c0138d36dbe22c2e1ca7e92e71b117 (diff) | |
| parent | db511f2372fb542baa83838d9552d249a8c2f164 (diff) | |
am db511f23: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'db511f2372fb542baa83838d9552d249a8c2f164':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions