tree f880ccbd8a24f1f397c0bddb73bebbaa8a66c751
parent 19f06de0930e0f741ed113c37faf306fceee39bd
parent b47584f46bd850723679d9212f66df1951bbdf5d
author Dan Stoza <stoza@google.com> 1429134870 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429134870 +0000

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

* commit 'b47584f46bd850723679d9212f66df1951bbdf5d':
  SF: Permit changing DispSync offsets at runtime