am c8bb2777: am 89624149: am 442a77b4: am 1004ed31: resolved conflicts for ed0ccb8a to mnc-dev

* commit 'c8bb2777413bb241b765a2479d7f41a4fde3bfd2':
  Improve the color comparison