tree 2ed645d259bc9563491c065f20384e336dc84762
parent 403e103eb298d29250aef303ba7d3a01daca0ffa
parent 47c3afa10bbe868a4414b114775e0414ef890045
author Felipe Leme <felipeal@google.com> 1466103227 +0000
committer android-build-merger <android-build-merger@google.com> 1466103227 +0000

Merge \"Check extra type before blindingly casting to Parcelable.\" into nyc-dev
am: 47c3afa10b

Change-Id: I4cb74a467a10ee3d38db91fde077263179bf9359