| commit | 9abf0b9031d0ddc33970589d2fb88065d15de712 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Fri May 02 17:28:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 17:28:53 2014 +0000 |
| tree | ee26232dbe3ceea1c234968dd9b266f53e1ab28d | |
| parent | 63f728065a7584e3a51bb7b0b58ce8cf0c25390e [diff] | |
| parent | 6015844578dc4d725c7ab3d3004d18ffea446087 [diff] |
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev * commit '6015844578dc4d725c7ab3d3004d18ffea446087': Make global action key timeout configurable.