diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:52:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:52:58 +0000 |
| commit | 4d1b3fda4343e026b2ec80689f5747744cc86692 (patch) | |
| tree | 1b65f274a1d48ddf9b2489d71c8fe6e6ead880d5 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 0882771d196468efad1e5350d0ba163c11e20b92 (diff) | |
| parent | 1584eefebd2de1bcce0e589ee6414df4bade07b9 (diff) | |
am 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1584eefebd2de1bcce0e589ee6414df4bade07b9':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions