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