tree 05c9bd586bc97ad66a6602dd721729da22be6040
parent 821b37d8174f2497153dfb8fcde7b8f84618e111
parent 2452774c0be2d6ebf2d433045d172787c90772ca
author Scott Kennedy <skennedy@google.com> 1396897751 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396897751 +0000

am 2452774c: am 62eb51af: Keep Parcelable CREATOR fields

* commit '2452774c0be2d6ebf2d433045d172787c90772ca':
  Keep Parcelable CREATOR fields