| commit | 203b43547da94c9fb78931680b99f9db49fc46c9 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 01:37:36 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 16 01:37:36 2015 +0000 |
| tree | bd3926702fbad81601a45bbb8087232806cf9f6d | |
| parent | eb26f5cecd5366b29b3cb746a7edaf3769f40480 [diff] | |
| parent | 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e [diff] |
Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev