tree 81d6770ca3810d95dcc553e3855ec403b01d2fec
parent 3b3e368c73f4224b055635e6e79f57cc702d8938
parent 3c1363beec9c142c062d8704b8bef4230b42eae5
author Dan Egnor <egnor@google.com> 1279659873 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279659873 -0700

am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo

Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor