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