OSDN Git Service

am d00737fc: am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db082...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:45:31 +0000 (02:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:45:31 +0000 (02:45 +0000)
commit592e874428920b5cc505952b988ae6fa6e977592
treed292b92f8d601370d676032e67ebe2b51a2a4af7
parentff6f0769790d85b352d72e10e12ec51fba5892dc
parentd00737fc72037d5af035108ef532edbc770c5039
am d00737fc: 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 'd00737fc72037d5af035108ef532edbc770c5039':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."