OSDN Git Service

am 2b564bf4: am 716c6269: am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:25:49 +0000 (02:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:25:49 +0000 (02:25 +0000)
commit8c8cc0dd2f2db88003793f0ad857cb01c2fedae0
tree5404ccd41cdad91c5ef62555e9b20cd5283cbc82
parent2c80eac9cdc5fe76daa48f6b99ed798ed2419483
parent2b564bf42a68370dc4d32acbb597cfb7c45f9f4f
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 '2b564bf42a68370dc4d32acbb597cfb7c45f9f4f':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""