tree 98d3dc23807f44568add1e2ddcfaffe59b8bad9f
parent a5940f8dca13152ffc091f4318705c8f071bac2c
parent 561f697e4b8527cc674f8ada5f82952c53760049
author Michael Lentine <mlentine@google.com> 1443205229 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443205229 +0000

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

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