OSDN Git Service

[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752ab...
authorBrad Ebinger <breadley@google.com>
Fri, 8 Jun 2018 20:10:54 +0000 (13:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 20:10:54 +0000 (13:10 -0700)
am: 741d43b7bb  -s ours

Change-Id: I142acf18a381fec5a5af7fba8b4fb6ee85c789aa


Trivial merge