| commit | 74c6f53858bd540dc801c0d5e0ea54819251a046 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Sep 18 18:15:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 18:15:09 2015 +0000 |
| tree | 9655342beabec84de047c375ccafaef0b4c8f2db | |
| parent | 92aaf481015fb78cfa868e87349bacaec41870c1 [diff] | |
| parent | 1b1eb050a0ea0016558cccbb029f7255284bd54f [diff] |
am 1b1eb050: Merge "ART: Decrease dex2oat watchdog timeout" * commit '1b1eb050a0ea0016558cccbb029f7255284bd54f': ART: Decrease dex2oat watchdog timeout