| commit | 4cbd30a1a3efccddcde64ff2b2244b631a5f530b | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Jan 14 17:30:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 14 17:30:04 2015 +0000 |
| tree | 175757048b87c238403c1e11b8346fa5f60e0efd | |
| parent | 2b001fef1280a738d760e31c5ffb65c5b9832317 [diff] | |
| parent | 2d33aa1997ef687e0e605a00e6daa73f74c9bd00 [diff] |
am 2d33aa19: am 4945bfef: Merge "ART: Change ternary location for timeout" * commit '2d33aa1997ef687e0e605a00e6daa73f74c9bd00': ART: Change ternary location for timeout