tree b60ddd93c466eb5eadeed427f9c60d8ee8746e1d
parent b4e3676be4e596013ea2948a3d41e5e7e0b5ee99
parent cf88432368501b446716885c5c656f7176abcef1
author Alice Yang <alice@google.com> 1363752557 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363752557 +0000

am cf884323: am c448f7c8: (-s ours) Fix BadParcelableException in intents

* commit 'cf88432368501b446716885c5c656f7176abcef1':
  Fix BadParcelableException in intents