tree 1f9a45db703b5d57653099dd783868c150b8dbfd
parent 47c888a9fb74f8a46fbf666f0611fd1a9491466f
parent 075c8f6e174e824b6bc95809cc25f1430e9d4e62
author Lajos Molnar <lajos@google.com> 1399051081 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399051081 +0000

am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"

* commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62':
  stagefright: add ClockEstimator API and WindowedLinearFitEstimator