tree 47f1335fe1d8539c741878b858465a4fe59d53c5
parent 88ca5398ebe4335ff3b14ad7e93712b2c7ae6c07
parent 5755817422700f6f5e8380921d1f5a728b677dd2
author Ronghua Wu <ronghuawu@google.com> 1452645638 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1452645638 +0000

Merge "Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC.""