commit | 638c1556ca9f4bfdff70d3d5f8d51b5cd8cfd799 | [log] [tgz] |
---|---|---|
author | Yu Chen <yu.y.chen@intel.com> | Thu Apr 20 05:11:47 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 05:11:47 2017 +0000 |
tree | b654007d043a90caf61289a750d97c5e6189e413 | |
parent | 419ae634864b4acf6d816fd158174ecb64ba15e9 [diff] | |
parent | 5477f9e47dbbce7731bf5a39ea1be5b673b76243 [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 am: df410012a3 am: 5477f9e47d Change-Id: I54879ec6e877fb8f4779be0c8490c7c17cf44eb2