am 9579ee38: am 6e42398d: Merge "Fix return value." into gingerbread

Merge commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0'

* commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0':
  Fix return value.