diff options
| author | Michael Runge <mrunge@google.com> | 2014-12-18 02:08:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-18 02:08:44 +0000 |
| commit | 3fa2307254a5f52369d0074fb87ca9cbc443d182 (patch) | |
| tree | 7af846e80c52b8d35569865dc26231fbb3c0193d /libs | |
| parent | 9f93e272da162d416878b902c11490a37afc1a2e (diff) | |
| parent | 647beed62236c996b946e85d06fdf4335b6a2a80 (diff) | |
| download | frameworks_base-3fa2307254a5f52369d0074fb87ca9cbc443d182.zip frameworks_base-3fa2307254a5f52369d0074fb87ca9cbc443d182.tar.gz frameworks_base-3fa2307254a5f52369d0074fb87ca9cbc443d182.tar.bz2 | |
am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev automerge: 8deabad
automerge: 647beed
* commit '647beed62236c996b946e85d06fdf4335b6a2a80':
Increase timeout when uncrypting OTA
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions