am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check"

* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
  Frameworks/base: Fix null-pointer check