| commit | f69c37dd3433b6a32d5bf703a6ad98b0c3a853fc | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:45:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:45:37 2015 +0000 |
| tree | d292b92f8d601370d676032e67ebe2b51a2a4af7 | |
| parent | 592e874428920b5cc505952b988ae6fa6e977592 [diff] | |
| parent | ea196888a0a1a9c0e67aa809676a12a7d0cb955e [diff] |
am ea196888: am e1ab0999: am 2b564bf4: 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 'ea196888a0a1a9c0e67aa809676a12a7d0cb955e': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""