OSDN Git Service

am 3dc5895d: (-s ours) am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33...
authorTao Bao <tbao@google.com>
Tue, 1 Sep 2015 16:09:35 +0000 (16:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Sep 2015 16:09:35 +0000 (16:09 +0000)
commit5ddf4c288f873180b0b59d35b9400885648e7cc2
treea25d81f40cf4857155c70096b94a06662ea3001b
parentb0cf4a6517c5cbef8ac5a9b96e254905cfa32183
parent3dc5895d9f9ba6b1c23231f41a2ee2aeb9f6358a
am 3dc5895d: (-s ours) am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.

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