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