tree eb93bcbb1094f8cd6c7823110da5cb4403033fc1
parent afff62b0b99a71ce42a07be632374346ec681d2a
parent a02bbf31c4a0d41eebaccbdd37bf9c48c7c82fc9
author Treehugger Robot <treehugger-gerrit@google.com> 1515710563 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1515710563 +0000

Merge changes from topic "m" into oreo-cts-dev

* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Verify b/67737022 fix presence
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Test that createBitmap(65535,65535) throws OOME
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506
  DO NOT MERGE Add new test type to StagefrightTest