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