OSDN Git Service

am 63348ae4: (-s ours) am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE...
authorZach Jang <zachjang@google.com>
Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2015 02:06:31 +0000 (02:06 +0000)
commit716c6269674474867dc4720f86f739c639c83400
treefc66900111f3cb4bb6bfdff9f86734e92fe3c8e4
parent971ff47c75889a2fc4ac710fbe62ba819feeaba6
parent63348ae4572cd9394e79fe343d2fca2b38498d1c
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 '63348ae4572cd9394e79fe343d2fca2b38498d1c':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""