tree e098ced948a2f11192ae0dfb2eb6f09570ac37fb
parent 6955ca07ae85bca6d1e4f15d8c0b6c743b43c815
parent 498e03debdb0431a80c3a2aa9fe629651d66c9e6
author Insun Kang <insun@google.com> 1522297023 +0000
committer android-build-merger <android-build-merger@google.com> 1522297023 +0000

Merge "VideoView2: Handles viewType attribute" into pi-dev
am: 498e03debd

Change-Id: Ife7df31f01da2a1898c6842fc3f0eea316d651ec