diff options
| author | Baligh Uddin <baligh@google.com> | 2015-11-05 21:11:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 21:11:44 +0000 |
| commit | 4296f4cbe25d0900da4c6b73aae21b3bea91a228 (patch) | |
| tree | e3ab6c1096cc81e2ebc5d4d11bc3599c322e6132 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13a4255b9e8e8bc77c933f3e8512415699ea7c40 (diff) | |
| parent | 335a6c58afed1ba18e2b2676ef98236d02f19648 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 57b7fa49ac -s ours
am: 335a6c58af -s ours
* commit '335a6c58afed1ba18e2b2676ef98236d02f19648':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions