summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-07-20 13:59:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-20 13:59:43 -0700
commit95127e043be8a6ca2247c621b2bd22ca660da654 (patch)
tree1d726b7b3320d5ba9d210eba530bb7b069e22e58
parent5933744aa368afe3aad691a541b1173d1f0d2563 (diff)
parent468c4f6de9c92bdf3a665be2fe4c07a19c633d45 (diff)
downloadframeworks_native-95127e043be8a6ca2247c621b2bd22ca660da654.zip
frameworks_native-95127e043be8a6ca2247c621b2bd22ca660da654.tar.gz
frameworks_native-95127e043be8a6ca2247c621b2bd22ca660da654.tar.bz2
am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread * commit '2f0dc6d9f50ceece294e9db393583e655d3bf781': COMMENT ONLY change to add some warnings about ParcelFileDescriptor
0 files changed, 0 insertions, 0 deletions