tree 262bd189a99b4c44da7bd146647619c1530dad89
parent 7804aa25c1288002269d4bd29f535cad8b55f365
parent 4a4e4a239f034cb8af2df9a438b26c3bc088889c
author Tim Murray <timmurray@google.com> 1461084603 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461084604 +0000

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