tree 92840d999ee6d073ab230f2a68e4f00d2a63d3dc
parent ee54efdb6e7caac88437dbb9f02737f8d44c3b8a
parent 9b8f99cbe2297c1aa9bd75e3b5468db85dcb6fe4
author Makoto Onuki <omakoto@google.com> 1289523772 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1289523772 -0800

Merge "Fix "Parcel@406cd448: Unmarshalling unknown type code...""