tree 146373b019a4908790b019644ebfdd0db18b0aff
parent ba65ffc4623240b38f8d2c940195a8bbdeb8e6a2
parent 1efb5151db674820841ee641c8df4fd9378695c0
author Treehugger Robot <treehugger-gerrit@google.com> 1515611155 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1515611155 +0000

Merge changes from topic "mm" into marshmallow-cts-dev

* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506