tree 3983de2ac224e2f1750b033be8472bcf6657f151
parent 9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6
parent 7f2c9e9420252a493b7399639f794c8a963444e5
author Adam Powell <adamp@google.com> 1394580398 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394580398 +0000

am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey