tree b5391db4354f4be5ce2a0a6e0e7374d698a886fe
parent c00f02db4731dd48887d84abf6c22b73d9c13574
parent a1a471b57d9aac2f22f7d9092b9b45b30454c147
author Insun Kang <insun@google.com> 1520334687 +0000
committer android-build-merger <android-build-merger@google.com> 1520334687 +0000

Merge "VideoView2: Move MediaControlView2's hidden constants" into pi-dev am: 7c1236a034
am: a1a471b57d

Change-Id: I8a520e01da5a7acb48ca430009f65596715889f2