tree 42d4be135a19d0e8aebd3cd2552b306365e03e8e
parent 91dea34652ff891192148b4062a80c2e8f0852ce
parent 66dc4ee3729c4e6fea624805a1e58843ce920477
author Dan Stoza <stoza@google.com> 1429136163 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429136163 +0000

am 66dc4ee3: am b47584f4: am 2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"

* commit '66dc4ee3729c4e6fea624805a1e58843ce920477':
  SF: Permit changing DispSync offsets at runtime