diff options
author | Baligh Uddin <baligh@google.com> | 2013-08-13 00:30:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-13 00:30:01 -0700 |
commit | dc5f592c0344e9fc308c68d7d2e80b8b7f82acab (patch) | |
tree | 2b93db658dea5fc588df917542e32b85d956d56c /rs/java/android/renderscript/Program.java | |
parent | 51843f8aa9a76207627288252a99f12141195a07 (diff) | |
parent | 78f5ef7143bb00c49e181197445ff20c2c5076f6 (diff) |
am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '78f5ef7143bb00c49e181197445ff20c2c5076f6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions