[automerger skipped] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free skipped: c458816556 skipped: fd3a46a9ba skipped: 099f0d75f6 skipped: 842144c616 skipped: 9b8f9d3c00 skipped: c3762fa147 skipped: 991a84f3d8 skipped: 15c0925fbd ski skipped: 7e571e4cb9 am: a28856d4cf -s ours am: 6579d3cdc0 -s ours

am: 291daf4507  -s ours

Change-Id: I84ac1bd1272ac361b1e92816cf6f5c958f3d7b4b
gugelfrei
Pawin Vongmasa 6 years ago committed by android-build-merger
commit 4051b1c2df

Diff Content Not Available