tree db7bb1ae48073f812b38fd5ce96bfbc5ff39d18c
parent 6e9f94360a2b4b3a3ce93d8c9c33efc87fef344f
parent 6328134d8f3969e5cf345bec84b2c6455afc6a34
author Tim Murray <timmurray@google.com> 1461084982 +0000
committer android-build-merger <android-build-merger@google.com> 1461084982 +0000

Merge "Revert "Revert "DispSync: Always resync after inactivity""" into nyc-dev
am: 6328134

* commit '6328134d8f3969e5cf345bec84b2c6455afc6a34':
  Revert "Revert "DispSync: Always resync after inactivity""

Change-Id: I65c59dbba8e9455eb853b15c0e08246480150acc