tree c0ca19242b3ad82b7e2df9650457284db4475d14
parent 127d933868b767eca1ec5446e91a3e8df65c659e
parent 1e4b0ca3bde8ea792aad83aefc891628ff6ec806
author Andreas Gampe <agampe@google.com> 1421255873 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1421255873 +0000

Merge "ART: Change ternary location for timeout"