diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-14 00:23:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 00:23:06 +0000 |
| commit | 25e41f4345c2e58e31c0e32507b6475107d9a286 (patch) | |
| tree | 4bf123f5deaf0a702347ef63b0f398bcaa4c521b /rs/java/android/renderscript/Program.java | |
| parent | 050246e0ebb14828110f07b5978b6ad7d4e6874f (diff) | |
| parent | e4f1c8ab271c06c03d7b962efed9a669f3c8986b (diff) | |
am e4f1c8ab: (-s ours) am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'e4f1c8ab271c06c03d7b962efed9a669f3c8986b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions