| commit | 974390debfc2daa49da5f14162fde12a1bc788fe | [log] [tgz] |
|---|---|---|
| author | Eric Rowe <erowe@google.com> | Sat Sep 06 01:37:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 06 01:37:15 2014 +0000 |
| tree | dd296aba796a8b4c49b44c3340185831320d72d2 | |
| parent | 7eeea906c3bca76602d2871212064387e0cc37df [diff] | |
| parent | f7efe33da234c834dff0292dc6aceed26388ccfa [diff] |
am 94614a7e: Merge "Increase long timeout to 2 minutes" into lmp-dev * commit '94614a7ea84eaf56ea249f60b004b1a8ce7c97ca': Increase long timeout to 2 minutes