Skip to content
Commit 81f50c35 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

[automerger skipped] Merge "AudioService: handle errors when reconnecting... 

[automerger skipped] Merge "AudioService: handle errors when reconnecting mixes after server crash" am: 0ac7e561 am: 933083b8 am: d9b96d99
am: 54ca7f76 -s ours
am skip reason: change_id I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5 with SHA1 549ac37d is in history

Change-Id: I2fec9caa6392568c7fd92635f498ebe5aaa5b75a
parents 2f5062a1 54ca7f76
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