diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-25 18:08:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 18:08:14 +0000 |
| commit | 2b3f2f45098dad06f0044a6e5a1a83f71ed89018 (patch) | |
| tree | 429516b81e783bfb4ec09ab774d29d4b7510443c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c594e9354a45f59472a670f2f87c42efa1fd9557 (diff) | |
| parent | fdfd01bef34ada326ff502f327e4387b8b14aa81 (diff) | |
am fdfd01be: (-s ours) am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'fdfd01bef34ada326ff502f327e4387b8b14aa81':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions