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