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

[automerger skipped] Merge "Fix parcelling issue for certain fields." am:... 

[automerger skipped] Merge "Fix parcelling issue for certain fields." am: 541f01b1 am: 07eec6e0 -s ours
am: acef882e -s ours
am skip reason: change_id I5ab4f5f3fa05ffe837f1a5b5bccfb93df4902574 with SHA1 362d3203 is in history

Change-Id: I3bf7879fc3d5e89ffef654d138549c09c5d1f3bb
parents f1529a69 acef882e
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