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