commit | 60d672be8be4fca632488ca6e895820b6d87018c | [log] [tgz] |
---|---|---|
author | Yu Chen <yu.y.chen@intel.com> | Thu Apr 20 05:04:23 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 05:04:23 2017 +0000 |
tree | fc6b142c3b6a4a5e402aa1bbbeb27a71cca2e746 | |
parent | c6bfeddfa48d8209771dcf11f906f8fa040a0add [diff] | |
parent | 419ae634864b4acf6d816fd158174ecb64ba15e9 [diff] |
Merge "Merge "Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev am: d4fe797f08" into nougat-cts-dev am: a1490fd005" into nougat-mr1-cts-dev am: f6687dce5b -s ours am: db79894072 am: a0032be82d am: 419ae63486 Change-Id: I2de07daf12863a5c5e7ee673f125deb93da86641