tree d8c4f0ba87bf154a6f0c5b64c2480b1dc22439ed
parent bb41a5f6def031b99f5569b192425b9edbdce7cc
parent 14e436aec45e7d83c2b3695c07d9740b9fd7f043
author Andreas Gampe <agampe@google.com> 1426602590 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426602590 +0000

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

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