| commit | f46009225bc06b0c6f0230b9f8585a81d8857477 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Fri May 02 17:33:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 17:33:48 2014 +0000 |
| tree | ab05a8e14a907f7b3ec0e80e6497a5d1989156f9 | |
| parent | 698a7ab344fc9ad88ea06599c957100df30abac2 [diff] | |
| parent | 9abf0b9031d0ddc33970589d2fb88065d15de712 [diff] |
am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev * commit '9abf0b9031d0ddc33970589d2fb88065d15de712': Make global action key timeout configurable.