tree 619880fd47f22d12ff1f3c8947e35f0831e22ba8
parent 6b8cf11049740ef0aab5240515fb26b7933a43b2
parent 4772bfeac8ca5aab7c6a573015c4c1aba5d2d94e
author Tomoharu Kasahara <tomoharu.kasahara@sony.com> 1534814680 -0700
committer android-build-merger <android-build-merger@google.com> 1534814680 -0700

Merge "Prevent old callback events when track is recycled" am: eb6c38a9eb am: aadc33659e
am: 4772bfeac8

Change-Id: I9a9cfb2d8b4756a9b484ec4698a94a85d2a7383a