diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:31:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:31:18 +0000 |
| commit | f8434712def33aef77067a18845509f7ee8394ee (patch) | |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7575570d3fa62be5b789e4106901dc3bc26d1c6 (diff) | |
| parent | 0367b1c123556ed0dc2d1326c16e0409aa258904 (diff) | |
am 0367b1c1: (-s ours) am ec10f595: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0367b1c123556ed0dc2d1326c16e0409aa258904':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions