tree 1e4a9fc90babb616c06734352bb215e02c1669e8
parent ccd94533ba9063827fbc5cc4e1eed266101e6cc3
parent 4bb49a7b073302dc3a9655451d875ea3256271c2
author Sungsoo Lim <sungsoo@google.com> 1554456013 -0700
committer android-build-merger <android-build-merger@google.com> 1554456013 -0700

Merge "Fix system_server watchdog timeout" into qt-dev
am: 4bb49a7b07

Change-Id: I1bdf728e3cad37a66bab21116902a5b15359fb1c