| commit | 5bddfe701bbdf2e006da4c008fc3e0f95b10e0c0 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Wed Sep 16 02:25:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 02:25:28 2015 +0000 |
| tree | cbcc19f512d92178b25da7ab9ce04eaaabc3ae16 | |
| parent | cc658ae87f0e457a3fed60e9c48e4d544d7a15a1 [diff] | |
| parent | 1049ba8a572f4d0fb06a1c8ec6d81758d0ee7e77 [diff] |
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 '0098cbc011771d5ffdf93a3a4b7e6a0507e1725d': Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."