tree 45e875c390355a62fb8386f3799237250a196593
parent 1e09e460beb6755aeb6a04b28ded2b48af5d605b
parent 115d98aba2cb850e0398442f0d3b22815965d8bc
author Rachad Alao <rachad@google.com> 1473276417 +0000
committer android-build-merger <android-build-merger@google.com> 1473276417 +0000

Merge "media: Move video buffer timestamp adjustment from CodecSource to GraphicBufferSource." into nyc-dr1-dev
am: 115d98aba2

Change-Id: I49d2be8f9eb03d87d5ce5ec658a109a7e37cbbd9