Skip to content
Commit 12e2065d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[automerger skipped] Merge "Handle ParcelableException instead of crashing... 

[automerger skipped] Merge "Handle ParcelableException instead of crashing system server" am: 592266cb am: 48a435ea am: 435cf631 -s ours
am skip reason: Change-Id Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5 with SHA-1 8ce32fe5 is in history

Change-Id: Iaacc2809364d73bb4752e1484f0f65fc5b466129
parents 8937dc04 435cf631
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