diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-27 14:02:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 14:02:12 +0000 |
| commit | 3a5edd9f183789090b657ab92db1425e74082fa6 (patch) | |
| tree | a0687a36d76b7dceb27157324e235aaee4ceac4d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5f181efd820c0554a071dd57b027ca35aa5b974f (diff) | |
| parent | 4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6 (diff) | |
am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4cd6da535a0b9a5938164edaa1a482a3c9f1ddf6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions