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

Merge commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into gingerbread-plus-aosp

* commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283':
  Fix return value.