tree 358814e992717abfe11d74165eaa725ba1454b0b
parent 5976cef6cc1064691f5764bbec81719b4407d60d
parent 338534857dcddeae5e35f3b23465786b23459b69
author Robert Shih <robertshih@google.com> 1479178372 +0000
committer android-build-merger <android-build-merger@google.com> 1479178372 +0000

Merge "PlayVideoActivity: update comments for ENABLE_PASS_DELAY am: 0b8bed432c" into marshmallow-cts-dev am: 118d9883fc am: da24d3f8ee am: 16105eb54e am: 30563cc16f am: 051d15057d am: e521e13c28 am: 9de0987635 am: 46ceb45cb5 am: 51851656b2
am: 338534857d

Change-Id: I08e88a74b77150c212c0c34e7878f8ed0b2fb350