diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-25 03:05:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 03:05:12 +0000 |
| commit | 56c2f8eefb7100ddc8850ccf744a7bc55e8d295d (patch) | |
| tree | 7997244812e1f5c956f3db417281bc5afe9d1017 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6a39ee4db5f81795cbbfce0c2a864d619e860d88 (diff) | |
| parent | 4ee34138c03dee1fd248046b135d9b4bcd84efdd (diff) | |
am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4ee34138c03dee1fd248046b135d9b4bcd84efdd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions