tree bf6d38807299d57b3d704e8ac6c480a075f1fccd
parent f73aab339ebfb9a05151bdf1dd632abe37becda4
parent a86465d7af8c8995210166954ec42624560bf86e
author Michael Lentine <mlentine@google.com> 1443204461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443204461 +0000

am a86465d7: am 8c743655: am cb13da97: Merge "Revert "Dismiss color fade when it is no longer used."" into mnc-dr-dev

* commit 'a86465d7af8c8995210166954ec42624560bf86e':
  Revert "Dismiss color fade when it is no longer used."