commit | 12f93222d8d133c90b6d6cc14d0f8e1a6d2fe022 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Feb 08 17:35:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 08 17:35:06 2017 +0000 |
tree | 6b08fc2c1e7fa8a500f8f6980cb994cd43100142 | |
parent | 06c28c5ba89ee25285523de6b846ee3e493a8724 [diff] | |
parent | 1e5d9506360ef6e48d6aaae16051e612846c04c4 [diff] |
Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into lollipop-mr1-cts-dev am: 92b7b8ec7f am: 5c1cf50a00 am: 6385414839" into nougat-mr1-cts-dev am: 1e5d950636 Change-Id: I2fbf50cfaff8cc380792a61898f9fabc56d878bc