tree b7b166b7a2e794ddd659cebe7373d9eb1f101725
parent 28bf844b077d55a5d1680c6ccedac15bb4052562
parent 741d43b7bb9e92390f80dd328ec18eaaf56ff237
author Brad Ebinger <breadley@google.com> 1528488654 -0700
committer android-build-merger <android-build-merger@google.com> 1528488654 -0700

[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752ab am: 1ff8f364d4  -s ours
am: 741d43b7bb  -s ours

Change-Id: I142acf18a381fec5a5af7fba8b4fb6ee85c789aa