diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:45:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:45:08 +0000 |
| commit | 54137069630259269555e017f472417c0fa99c47 (patch) | |
| tree | 718b77aeeafad02c7a85b4fb1e6b4509a61f809b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c14b17822d7c1a183de0e30307abcf86350a80cc (diff) | |
| parent | 8a17c86343e215056090cdd7caff977bcd205dc3 (diff) | |
am 8a17c863: (-s ours) am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '8a17c86343e215056090cdd7caff977bcd205dc3':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions