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