am 14e436ae: am 345a8f69: Merge "Frameworks/base: Fix a comparison"

* commit '14e436aec45e7d83c2b3695c07d9740b9fd7f043':
  Frameworks/base: Fix a comparison