| commit | 11317e82cf561597bbd4e2dbf5840854e6b7a16d | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 01:44:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 01:44:58 2015 +0000 |
| tree | 0bac82d1d35f68b75a235354d24ca65d6e4ccfb1 | |
| parent | 00db0826561b23a54db28ed5203fd7eff79c16c7 [diff] | |
| parent | 32a420ea36fbae07484f6fcf718ed97865ca3158 [diff] |
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev * commit '32a420ea36fbae07484f6fcf718ed97865ca3158': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""