am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread

Merge commit '1db0e88e60ca4f99edff149fe2ab8499e749df47'

* commit '1db0e88e60ca4f99edff149fe2ab8499e749df47':
  Fix a memory corruption when writting Sensor into a parcel