tree e2138223e1e5d355cad4f25b34ef305cb5ed59df
parent 3bb46be774b516f4376e61cb412a35e712e1d1d1
parent 1db0e88e60ca4f99edff149fe2ab8499e749df47
author Mathias Agopian <mathias@google.com> 1279854714 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279854714 -0700

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