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