OSDN Git Service

am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into...
authorJustin Koh <justinkoh@google.com>
Fri, 2 May 2014 17:33:48 +0000 (17:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 17:33:48 +0000 (17:33 +0000)
commitf46009225bc06b0c6f0230b9f8585a81d8857477
treeab05a8e14a907f7b3ec0e80e6497a5d1989156f9
parent698a7ab344fc9ad88ea06599c957100df30abac2
parent9abf0b9031d0ddc33970589d2fb88065d15de712
am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev

* commit '9abf0b9031d0ddc33970589d2fb88065d15de712':
  Make global action key timeout configurable.
api/current.txt
core/java/android/view/ViewConfiguration.java
core/res/res/values/config.xml
core/res/res/values/symbols.xml
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java