| commit | ea196888a0a1a9c0e67aa809676a12a7d0cb955e | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:32:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:32:04 2015 +0000 |
| tree | 7be528baa9a74afad0f28304cec7fd29d110f494 | |
| parent | d00737fc72037d5af035108ef532edbc770c5039 [diff] | |
| parent | e1ab0999cdcb719480200ea6be71a60f58ce90f4 [diff] |
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 'e1ab0999cdcb719480200ea6be71a60f58ce90f4': Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""