tree c144601086d7ba6523d073f4d88e1b77356285ee
parent cccd67b574c39547195fe06b781cb3bfd8d9d4dd
parent 5fdd8491e9dd5c437e46245c79bf3b5a0fb31866
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1522710816 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522710816 +0000

Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am: 4921986db7 am: 609bc2d63e am: 3f13ccee8c  -s ours" into pi-dev