tree 71870ac51f705c49f1543529c2f3c2b2979fb643
parent 7b9bcf02e1954b48a80a9e43df5b25d875172730
parent 0d93002af027044070a554d553ab524564404b18
author Michael Lentine <mlentine@google.com> 1442986385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442986385 +0000

am 0d93002a: am 17a76443: Merge "Dismiss color fade when it is no longer used." into mnc-dr-dev

* commit '0d93002af027044070a554d553ab524564404b18':
  Dismiss color fade when it is no longer used.