| commit | d00737fc72037d5af035108ef532edbc770c5039 | [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 | 7be528baa9a74afad0f28304cec7fd29d110f494 | |
| parent | 5bc891c8a8e81b8264b06794abc346e5da733c2b [diff] | |
| parent | eee9c2de434f89764b66dbe9dc7c8169971e5228 [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."