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