| commit | 2b564bf42a68370dc4d32acbb597cfb7c45f9f4f | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:16:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:16:04 2015 +0000 |
| tree | f7fd18e2fcc8d0fa62c0f5cbfa2880cb86675b5d | |
| parent | 0098cbc011771d5ffdf93a3a4b7e6a0507e1725d [diff] | |
| parent | 716c6269674474867dc4720f86f739c639c83400 [diff] |
am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev * commit '716c6269674474867dc4720f86f739c639c83400': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""