diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-12 18:18:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 18:18:21 +0000 |
| commit | 29e963afbcca60cb3364d1350d7667e6c2a61789 (patch) | |
| tree | d2ed5b0c0b62247600cc3615ba418450cb846538 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae878c851f01848ccae9ddc81d613123df12651e (diff) | |
| parent | b689d776bb5c3b8cc8778813db4b308acd9a7f61 (diff) | |
am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'b689d776bb5c3b8cc8778813db4b308acd9a7f61':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions