OSDN Git Service

am eee9c2de: am 0098cbc0: am 971ff47c: am 1b06455e: (-s ours) am 00db0826: am 203b435...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:31:58 +0000 (02:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:31:58 +0000 (02:31 +0000)
commitd00737fc72037d5af035108ef532edbc770c5039
tree7be528baa9a74afad0f28304cec7fd29d110f494
parent5bc891c8a8e81b8264b06794abc346e5da733c2b
parenteee9c2de434f89764b66dbe9dc7c8169971e5228
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 'eee9c2de434f89764b66dbe9dc7c8169971e5228':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."