| commit | 8b6f28f07b9a1c60f1279ca14663efd5988cad14 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Sat Jan 21 03:55:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 21 03:55:57 2017 +0000 |
| tree | ab83949e8f1f55777d098fa7e58a11b5c8ab0b7d | |
| parent | 7ce0fae0a650ae7fda0d5d3e9d7c475bbf56bd32 [diff] | |
| parent | 16a8096305428231bec730d2a1a6d0a36df125d8 [diff] |
Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into marshmallow-cts-dev am: 2a60ac189a" into nougat-cts-dev am: bef1c0a8d6 am: 9f3c084299 am: f2523c127e am: 6efb88c076 am: ed6fd6d874 am: 16a8096305 Change-Id: I7085595816a1d46385432a78e8637c7faeabc32c