tree 5a69ed2d978b042d5c9f8ad10875298e11d5f923
parent 7619ad3ab19967af4bc008e0134ac4796dc5945b
parent f05cc659f473da2c6f563aecb3e3d7d7341cc87e
author Kalle Raita <kraita@google.com> 1442949495 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442949495 +0000

am f05cc659: am 74e984f4: am 875dc8af: Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev

* commit 'f05cc659f473da2c6f563aecb3e3d7d7341cc87e':
  Increase deqp inactivity timeout to 10 mins