Skip to content
Commit aa035cf7 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

[automerger skipped] Merge "Adds a private field to parceled data." am:... 

[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752 am: 1ff8f364  -s ours
am: 741d43b7  -s ours

Change-Id: I142acf18a381fec5a5af7fba8b4fb6ee85c789aa
parents 28bf844b 741d43b7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment