diff options
| author | Geoff Mendal <mendal@google.com> | 2016-01-11 15:42:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-11 15:42:10 +0000 |
| commit | 0663959eb73127a49d0a72a70000f3b092adc3e6 (patch) | |
| tree | 9fd3bd29bb43853a8f60d133a0ccedb52440d38f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0b8de39728014ad51ff6784a3850a3d752f715e3 (diff) | |
| parent | 73992aee94ce78b8827fe05bb5537068a96c835d (diff) | |
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours
am: 73992aee94 -s ours
* commit '73992aee94ce78b8827fe05bb5537068a96c835d':
Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions