Skip to content
Commit 5d38ef8c authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

[automerger skipped] Merge "SoundPool: Do not sleep on stop for USAGE_GAME or... 

[automerger skipped] Merge "SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END" into qt-qpr1-dev am: 5e7948d3
am: 4eff657e -s ours
am skip reason: change_id I83b9b1d61b65dcc4a73d676e1f8be1e022c70302 with SHA1 a5275243 is in history

Change-Id: I55104fa72323868270fbcb69eb406a46c2b55758
parents 8ff53c26 4eff657e
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