commit | 52ab16e63b3031f31ced62ee9a2751a582315ff7 | [log] [tgz] |
---|---|---|
author | Android Merger <android-build-merger@google.com> | Wed Feb 08 15:50:23 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 08 15:50:23 2017 +0000 |
tree | 8d70b4c0edbcb780effe24765731915725231310 | |
parent | 7766f6c08ec4839b3866bd00a8e4e992f8ffdafc [diff] | |
parent | daa47eda260b64a867b171d26e8a7784ee86f322 [diff] |
Merge "Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into kitkat-cts-dev am: 4e3a5a53c5 am: 6d666f5e14 am: edf682a6e3" into marshmallow-cts-dev am: 5369516c42" into nougat-cts-dev