am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings"

* commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162':
  Frameworks/base: Fix more warnings