tree 90917f5724bf8c872727f7040db2d938e0abd91a
parent 26ac45e9d5ed503cfa9dcd877d4a6420798f7ca0
parent 9670850d0178ced404cca2c101708d7c5876bc6d
author Chien-Yu Chen <cychen@google.com> 1456873858 +0000
committer android-build-merger <android-build-merger@google.com> 1456873858 +0000

Merge "CameraSource: Wait before dropping a frame" into nyc-dev
am: 9670850d01

* commit '9670850d0178ced404cca2c101708d7c5876bc6d':
  CameraSource: Wait before dropping a frame