| commit | 2d33aa1997ef687e0e605a00e6daa73f74c9bd00 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Jan 14 17:23:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 17:23:46 2015 +0000 |
| tree | c0ca19242b3ad82b7e2df9650457284db4475d14 | |
| parent | 879a2a76c21fbbf9ef89ddc09909ec6455fe569f [diff] | |
| parent | 4945bfef00ac446d9c5458e55500229d463ab4c3 [diff] |
am 4945bfef: Merge "ART: Change ternary location for timeout" * commit '4945bfef00ac446d9c5458e55500229d463ab4c3': ART: Change ternary location for timeout