diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 18:16:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 18:16:46 +0000 |
| commit | 98adccb5f901180c37efdeec44faa4faeada5031 (patch) | |
| tree | cd16f63e49e7e644433abd1c5ffd1c3a780bee73 /rs/java/android/renderscript/ProgramStore.java | |
| parent | e88bc34c3e462e05b6054f7fb2761da7a751998b (diff) | |
| parent | d3958df3bc1deee06807dd33385a85532cf7b92d (diff) | |
am d3958df3: (-s ours) am 57e83d53: (-s ours) am 06f02f3e: (-s ours) am dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'd3958df3bc1deee06807dd33385a85532cf7b92d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions