| commit | 63348ae4572cd9394e79fe343d2fca2b38498d1c | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 01:56:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 01:56:57 2015 +0000 |
| tree | 49f056d9bc7974bd57a69ddf2ec084898c5e3d05 | |
| parent | 1b06455e44395489dcd027a170e68eabf2ebe1da [diff] | |
| parent | 11317e82cf561597bbd4e2dbf5840854e6b7a16d [diff] |
am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev * commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""