OSDN Git Service

Merge "Revert "Revert "DispSync: Always resync after inactivity""" into nyc-dev
authorTim Murray <timmurray@google.com>
Tue, 19 Apr 2016 16:56:21 +0000 (16:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Apr 2016 16:56:21 +0000 (16:56 +0000)
am: 6328134

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

Change-Id: Ibfeff32f7d151606e0380354c1c498124b87acda


Trivial merge