Skip to content
Commit f22ccce7 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

[automerger skipped] Merge "AudioService: communicate audio HAL process pids... 

[automerger skipped] Merge "AudioService: communicate audio HAL process pids to native audioserver" am: e16beef1 am: 917934e7
am: 042d6f10 -s ours
am skip reason: change_id I3e35b8040779e041b8d8c2e72d1e650d6f8fe818 with SHA1 4a5db4cd is in history

Change-Id: Ie43ccdf082a123378718303e17a48f1e9ee86b5b
parents 0bcd19ac 042d6f10
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