tree 966078211b85ae42988dabbab1f84cf645875ac4
parent 7abbfc5c3b5caf3e59dfee337712b5db957a50b1
parent 0d6e1299624e377c998fe38915b1a1d71801facd
author Android Build Merger (Role) <android-build-merger@google.com> 1511143879 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1511143879 +0000

[automerger] Media-compat-test: Restore tests skipped by ag/3202736 am: 0d6e129962

Change-Id: I120753d7a3247948928f0bd2831b5d240d76b835