OSDN Git Service

am ea196888: am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e8...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:45:37 +0000 (02:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:45:37 +0000 (02:45 +0000)
commitf69c37dd3433b6a32d5bf703a6ad98b0c3a853fc
treed292b92f8d601370d676032e67ebe2b51a2a4af7
parent592e874428920b5cc505952b988ae6fa6e977592
parentea196888a0a1a9c0e67aa809676a12a7d0cb955e
am ea196888: am e1ab0999: am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev

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