| commit | 52b290f73f1cd1a6ab791f21e78245becfe0b29d | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 03:04:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 03:04:29 2015 +0000 |
| tree | 84efba0b962ec65d27cc52084f8b76d1be45ed7e | |
| parent | e268c1fff19ab092bf3d5dd2e6348bea5b0f1b42 [diff] | |
| parent | f69c37dd3433b6a32d5bf703a6ad98b0c3a853fc [diff] |
am f69c37dd: (-s ours) 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 'f69c37dd3433b6a32d5bf703a6ad98b0c3a853fc': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""