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