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