OSDN Git Service

am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 01:44:58 +0000 (01:44 +0000)
commit11317e82cf561597bbd4e2dbf5840854e6b7a16d
tree0bac82d1d35f68b75a235354d24ca65d6e4ccfb1
parent00db0826561b23a54db28ed5203fd7eff79c16c7
parent32a420ea36fbae07484f6fcf718ed97865ca3158
am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""