Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am: 4921986db7 am: 609bc2d63e am: 3f13ccee8c -s ours" into pi-dev
am: 3e8e71d1ec -s ours
Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b
This commit is contained in: