diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-08 17:39:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-08 17:39:29 +0000 |
| commit | c8da7d5366ee92a81d92d7e5c18fd769a1961032 (patch) | |
| tree | 705a3a72634c4efcf36f40c65f9ff355802911d2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 62a650715df7aa29c9913d8bb064a8845eeda110 (diff) | |
| parent | 3c573bc5699924f5c393043847b011669b718a67 (diff) | |
am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '3c573bc5699924f5c393043847b011669b718a67':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions