OSDN Git Service

[automerger skipped] Merge "Osu: fixed Mismatch between createFromParcel and writeToP...
authorEcco Park <eccopark@google.com>
Fri, 4 May 2018 21:40:45 +0000 (14:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 May 2018 21:40:45 +0000 (14:40 -0700)
commit47e3c8713e25f720c3dce927a30337a22eef0d17
treeb25d8542148f1f582b14982c30ff2cdbc1e1673a
parente74dc3cfdd630dc9ec70a06abbab4ac5339ef151
parent504d75feda55847e7cc02edc9918c683bf91a96b
[automerger skipped] Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev am: a13c8187c8 am: 8720a5e1b7 am: b3e9029c91  -s ours
am: 504d75feda

Change-Id: If8935d66d787891d64197ee5d17e08cb702a4bc7