tree e837eb99d29a3f03d4d5b45421c4c34ea8baaaa8
parent 6f071c369e93550e7a6cc2747377b252cc832aad
parent 1cd133a4d090b694f57dae3cbdda9cfe0600aef4
author TreeHugger Robot <treehugger-gerrit@google.com> 1497468228 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497468235 +0000

Merge changes from topic 'wallpaper_grey_scrim-oc-dr1-dev' into oc-dr1-dev

* changes:
  Fixed flaky test
  Disabled test
  Scrims should be grey when in-app