tree 9abe630a6ae909552b3fd480c1b93bc946ce5782
parent 27b3ce4922f55fcc79a56f8f9890a67957aafc12
parent fa97d22b9463a9ad4c2d4e16b6644ab97da150d4
author Insun Kang <insun@google.com> 1520474074 +0000
committer android-build-merger <android-build-merger@google.com> 1520474074 +0000

Merge "VideoView2: Initial integrated version with MediaPlayer2" into pi-dev
am: fa97d22b94

Change-Id: I771d87da4197b11636c4352ded3c74f00f29d9b4