OSDN Git Service

Merge "Osu: fixed Mismatch between createFromParcel and writeToParcel" into oc-dev
authorEcco Park <eccopark@google.com>
Fri, 4 May 2018 20:34:34 +0000 (13:34 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 May 2018 20:34:34 +0000 (13:34 -0700)
am: a13c8187c8

Change-Id: I5ffcd6ba62f2c085f2a9929fadd0366238c9183a


Trivial merge