tree bb636c022779e3ae9d22921e2ae65dcff7456c0f
parent 68ca14648c88d84080cafae02c9bc5cf3448096a
parent 3caf92582498bad8fe79f6e3235be218e82b7f68
author Justin Koh <justinkoh@google.com> 1399329493 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399329493 +0000

am 3caf9258: Merge "Hide getDeviceGlobalActionKeyTimeout" into klp-modular-dev

* commit '3caf92582498bad8fe79f6e3235be218e82b7f68':
  Hide getDeviceGlobalActionKeyTimeout