OSDN Git Service

am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump...
authorTao Bao <tbao@google.com>
Mon, 31 Aug 2015 22:45:15 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Aug 2015 22:45:15 +0000 (22:45 +0000)
commit188a33c7acb53fb59364b82a41ec9270f6aef5cf
tree8bf4bc6a493ef3b5872bd3ee44e02c2d6867e9d6
parent7878eee8a9c20752e038f563b98b6b42c372cd0f
parent7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f
am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

* commit '7b7a3e75c3a107c139a7832c5a04cc0d01b7cd1f':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.