| commit | 2c151620376568ef6d86bfc7844f20b6dc4a5bf8 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Nov 05 19:01:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 19:01:33 2014 +0000 |
| tree | d8e9094692c59389d6e467649c08958c87b823fe | |
| parent | ab777cf315b8cbb0df567551426b958baf8eda7b [diff] | |
| parent | 907080c64655c2bccba298bca637cfcc0f609d3c [diff] |
am 907080c6: Merge "Restore run-test TIME_OUT feature" * commit '907080c64655c2bccba298bca637cfcc0f609d3c': Restore run-test TIME_OUT feature