tree 560b9ce0fe67c5ddb80d4d1526f48bddb99f5d2a
parent c720d6e2bfa35e35b4114f9018359f9976a78def
parent 48e490bbc66379ced0f9067862e8e591ea6e8c81
author akirilov <akirilov@google.com> 1523406422 -0700
committer android-build-merger <android-build-merger@google.com> 1523406422 -0700

[automerger skipped] [automerger] Disallow reading object data from Parcels with non-object reads am: f784183c17 am: c6ae5cf9c5 am: 22b5950994 am: f4dc4cd4a3 am: 81a160b19e am: 2d14de5c70 am: 9f92221278 am: 2de1de1499 skipped: e6373f11f4 am: 2944d59824  -s ours
am: 48e490bbc6  -s ours

Change-Id: Ib587b76745a36017ed21b3fa8beb9d94ff6f87d9