| commit | 3fa2307254a5f52369d0074fb87ca9cbc443d182 | [log] [tgz] |
|---|---|---|
| author | Michael Runge <mrunge@google.com> | Thu Dec 18 02:08:44 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 18 02:08:44 2014 +0000 |
| tree | 7af846e80c52b8d35569865dc26231fbb3c0193d | |
| parent | 9f93e272da162d416878b902c11490a37afc1a2e [diff] | |
| parent | 647beed62236c996b946e85d06fdf4335b6a2a80 [diff] |
am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev automerge: 8deabad automerge: 647beed * commit '647beed62236c996b946e85d06fdf4335b6a2a80': Increase timeout when uncrypting OTA