diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:27:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:27:58 +0000 |
| commit | 9139d5b0fd3b523deb6fffe534fc07c462604483 (patch) | |
| tree | 317a366c1ef24ba5c396b812c2ebff7782ab31a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f88916cabcc3d4ce885226789ecbdb1a7db722b7 (diff) | |
| parent | 4155d9f37762a6a91d47c383f9c3a9fd3aa7f884 (diff) | |
am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions