am 4ffc2eb9: Fix bug 2950316.  Check return values.

Merge commit '4ffc2eb9858fbce8558a52755b4e48a928399cce' into gingerbread-plus-aosp

* commit '4ffc2eb9858fbce8558a52755b4e48a928399cce':
  Fix bug 2950316.  Check return values.