| commit | 6015844578dc4d725c7ab3d3004d18ffea446087 | [log] [tgz] |
|---|---|---|
| author | Justin Koh <justinkoh@google.com> | Fri May 02 17:25:50 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 02 17:25:50 2014 +0000 |
| tree | a26ba8945cb043c35227a867b8e8f700695ab771 | |
| parent | 11b1469144d73ad0280ef9d0c2e478d180f17074 [diff] | |
| parent | feabd2c7304f05eab30eebeb50016b073735443b [diff] |
Merge "Make global action key timeout configurable." into klp-modular-dev