commit | df410012a3505f7471828e5a2f5d32695b3f51bc | [log] [tgz] |
---|---|---|
author | Yu Chen <yu.y.chen@intel.com> | Thu Apr 20 05:01:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 05:01:50 2017 +0000 |
tree | 5aca5ec65589d248ef533a34e7d87b9d56199506 | |
parent | db798940725e3a02ccc30baa7cbc23a0b85e49b1 [diff] | |
parent | a37549e1b7578818c381910cabf219dd33e48c7d [diff] |
Merge "Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev am: d4fe797f08" into nougat-cts-dev am: a1490fd005 -s ours am: ccc24a6731 am: a37549e1b7 Change-Id: I52f246b2a4d38033ba364b0d900cef5ad4824ffe