am 8ff96805: Merge "Eliminate compiler warning" into gingerbread

Merge commit '8ff9680522c096ef76fbe087e50f04d76c172173' into gingerbread-plus-aosp

* commit '8ff9680522c096ef76fbe087e50f04d76c172173':
  Eliminate compiler warning