tree 22f54512f21690736519c256d9a0d63e2801af2b
parent 7d226163cd03a455f8dd1133f6448826072f071d
parent bc120be8d7ff639408048fc3f105abd0aa6cfbe2
author Dan Stoza <stoza@google.com> 1438806989 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438806989 +0000

am bc120be8: am 2121b937: am 04eeb288: am 50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev

* commit 'bc120be8d7ff639408048fc3f105abd0aa6cfbe2':
  SF: Track missed frames and optionally drop them