tree 77b6dc1658045733749ef6f8cf9e0e6b63f2288c
parent dd6ca42934a00725d9f983e2ec144524e96895d1
parent 6c5dddfdcfd9211c26465c396d9338e09b74f791
author Selim Cinek <cinek@google.com> 1457741629 +0000
committer android-build-merger <android-build-merger@google.com> 1457741629 +0000

Merge changes Ia6156d7c,I396ac936 into nyc-dev
am: 6c5dddfdcf

* commit '6c5dddfdcfd9211c26465c396d9338e09b74f791':
  Fixed a bug with autoredacted custom views.
  Fixed a bug where notifications could become all white