tree f9ff1eda367468f3d66e45a41c9a8061a3ad8110
parent de9c1104a6c341c3413f80637a84293e27606606
parent ae6ae043fb87301610d521b0a6a1ab74fb8db2f6
author Dan Stoza <stoza@google.com> 1436301382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436301382 +0000

am ae6ae043: am 0eb2d398: SF: Ignore PTS more than one second in the future

* commit 'ae6ae043fb87301610d521b0a6a1ab74fb8db2f6':
  SF: Ignore PTS more than one second in the future