diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-19 17:56:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 17:56:30 +0000 |
| commit | e409561a1757cd9004e50ce5ab3c4e29a747a3c5 (patch) | |
| tree | e0fea6e22b486d7e47f83f2921a9b529f9f100d0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e5186c12ec1c95b75d0fef1a38f94483e31aae6f (diff) | |
| parent | cfe34ebce6d2a6bd4f682d8f002b8318942ec30d (diff) | |
am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'cfe34ebce6d2a6bd4f682d8f002b8318942ec30d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions