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