tree 7a99a3eca303a18bedd8c62c728818731f01e117
parent f64f80ec0476d3e47b39a8a14a704dc2acd553f5
parent 82cb765c2a48d1a6787c2c2dac924dc6addf670f
author Insun Kang <insun@google.com> 1520475247 +0000
committer android-build-merger <android-build-merger@google.com> 1520475247 +0000

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

Change-Id: Iac7468b6c8f34f1bff7ae04536e1296ecdea690d