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)
commite5b4a8d9cca8ceec4f1c9132f99a2a6b8fdd689f
tree78a55b8624735a5f68db00a134d39dd8f82beefb
parent0e2563284c2cb2b505eff2e8cadd49bfaaaa4a2b
parent3e8e71d1ec5d7bc1f2bf75eb8f8631ac3d0574ab
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