OSDN Git Service

Merge "[automerger skipped] Use concrete CREATOR instance for parceling lists am...
authorFyodor Kupolov <fkupolov@google.com>
Tue, 3 Apr 2018 03:22:44 +0000 (20:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 Apr 2018 03:22:44 +0000 (20:22 -0700)
am: 3e8e71d1ec  -s ours

Change-Id: I921551eb006ac41034c730ad5d27c2831160ad9b


Trivial merge