tree bd72dadd0d84546612d1218e206d30366fafd20d
parent a36e36d289d1d0831311f28e8e3370d411b68411
parent 9df87be1c47e086ef5dba01532416d25c9fa7910
author Hyundo Moon <hdmoon@google.com> 1501700084 +0000
committer android-build-merger <android-build-merger@google.com> 1501700084 +0000

Merge "Media-compat-test: Add a simple test method" into oc-support-26.1-dev
am: 9df87be1c4

Change-Id: I6207a13d5163deb437f3d0dad59240f4f5bb797d