diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 16:02:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 16:02:02 +0000 |
| commit | 34597e4f6dcda220c22bf008dedafa902ca24904 (patch) | |
| tree | 933afff8eeb2b66569e41799e504e413ed0e0f11 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd0d0115b67ff2f3bb5efcf34812596e81e1eded (diff) | |
| parent | 856a9f99d514c6adf55c9ecedde866582a03a84a (diff) | |
am 856a9f99: (-s ours) am e7575570: (-s ours) am ebaecc0c: (-s ours) am cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '856a9f99d514c6adf55c9ecedde866582a03a84a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions