Commits
Teng-Hui Zhu authored and Android Git Automerger committed cffefb7062eM
am 9895881b: am 9ac32040: Merge "Keep the controller when video ended." into jb-dev * commit '9895881b2ca944e57b625368df18f40d3feeeba8': Keep the controller when video ended.
Showing diff to87084281ca9