tree eb31fb77f5bf05ca2e710ca6e3d3c5b1c603b38e
parent 8cf489c1f509ad2414a887035ad3d6996d1931a3
parent d8ccd712dac9e8f4e8068b02f5ca55b014de831a
author Jean-Baptiste Queru <jbq@google.com> 1339780250 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339780250 -0700

am d8ccd712: Merge "Parcel compRequired flag correctly."

* commit 'd8ccd712dac9e8f4e8068b02f5ca55b014de831a':
  Parcel compRequired flag correctly.