diff options
| author | Baligh Uddin <baligh@google.com> | 2015-11-05 21:14:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 21:14:15 +0000 |
| commit | 951b0943673fd165c7e35182062578616fd2943a (patch) | |
| tree | e3ab6c1096cc81e2ebc5d4d11bc3599c322e6132 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 56d9e6570cb0391d4d620b64b1db36691d4faac7 (diff) | |
| parent | 82ab657901ef66fba38c67d7c6589d22cc82e3dd (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 97bf3b5922 -s ours
am: 82ab657901 -s ours
* commit '82ab657901ef66fba38c67d7c6589d22cc82e3dd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions