diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-18 11:00:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-18 11:00:37 -0800 |
| commit | f60b86ecd2a8f87ede2a62865f8a179f8b3b7ddf (patch) | |
| tree | 015c543c3bce81fd545d29297de9d3a47d58538f /graphics/java/android/renderscript/ProgramRaster.java | |
| parent | 684d488ab44004dc166de8b2ceec466e47b98dd5 (diff) | |
| parent | 1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e (diff) | |
am 1dc93acf: (-s ours) am 4dee4e1c: (-s ours) am 35fb6cdf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions