| commit | 1dd9f6d96e819154c34c14e699d8078e65eb114c | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:31:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:31:58 2015 +0000 |
| tree | e2672ca547a68f4d9dff978e68de3e2fafbbc64e | |
| parent | db91ecd4ddb38ba0da08b462a7497e2e0b9f5119 [diff] | |
| parent | 5bddfe701bbdf2e006da4c008fc3e0f95b10e0c0 [diff] |
am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev * commit 'eee9c2de434f89764b66dbe9dc7c8169971e5228': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."