diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 16:38:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:38:52 +0000 |
| commit | 5114a0ec7400486ce8c4aca734d9151c73f7e486 (patch) | |
| tree | e822e78638d7e4dc7820d3ce3823f91656ee4fca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4f3d5c75e09c7d1562506ea792428ac5a0241561 (diff) | |
| parent | 8fbed3d1a4c666c562fe5efd2b9d72375c453497 (diff) | |
am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '8fbed3d1a4c666c562fe5efd2b9d72375c453497':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions