tree 7076cc3da830f3ab0ed20abe533906ff78214705
parent da983339c4c00ac1c2305315ad45f62151bd6ae3
parent 5964127d16289c609fca4831258c700ff90152bd
author Kalle Raita <kraita@google.com> 1442948034 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442948034 +0000

Merge "Increase deqp inactivity timeout to 10 mins" into mnc-dev