diff options
| author | Adam Powell <adamp@google.com> | 2014-03-13 23:59:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 23:59:57 +0000 |
| commit | 6395c6a4909749d54679be16411783ccaeba4372 (patch) | |
| tree | 2d2ad4f5b9a32f4fa603c06c4054db7139043760 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cb1254f1abc44b82e2a9da0d9a73230eb46e129e (diff) | |
| parent | 6cde6c75b3469b7f76343ef7fc646f65c8393a17 (diff) | |
am 6cde6c75: am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev
* commit '6cde6c75b3469b7f76343ef7fc646f65c8393a17':
Add a config override for ViewConfiguration#hasPermanentMenuKey
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions