tree c98f92daa751b860db9aa99092bde7091f83e565
parent 842062a80b276c95471ccca94cdace79651cb8cf
parent 74246140aaa6ba7fc1c3565be9c3db0f31dd157d
author Marco Nelissen <marcone@google.com> 1496334860 +0000
committer android-build-merger <android-build-merger@google.com> 1496334860 +0000

Merge "Revert "Add new test type to StagefrightTest"" into oc-dev am: 8aad05affd
am: 74246140aa

Change-Id: I3eb7d314ff9a9d03e31a239904cb5c6dc28aade0