diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-01 07:37:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-01 07:37:09 -0700 |
| commit | 154abe1e7b66b1a09d62beefe7aab95820f028d1 (patch) | |
| tree | 1665087a191f5aed6dcb4110b8b9bb48ec5854ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a9a2089852d18ef7abbb9476fc3455bfec5a880 (diff) | |
| parent | 2bc2574e60b5050107c28e4bc4f1fd505467c9d6 (diff) | |
am 2bc2574e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '2bc2574e60b5050107c28e4bc4f1fd505467c9d6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions