commit | 419ae634864b4acf6d816fd158174ecb64ba15e9 | [log] [tgz] |
---|---|---|
author | Yu Chen <yu.y.chen@intel.com> | Thu Apr 20 05:01:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 20 05:01:48 2017 +0000 |
tree | b654007d043a90caf61289a750d97c5e6189e413 | |
parent | ab53bba172412e6319d68ba2a6f8862b982297e3 [diff] | |
parent | a0032be82d0b1a7a3d6dc55e6aabefe29afbb534 [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 Change-Id: Ie9390cd7b44c0d43ee2cd5d24f1a4f26444436a2