tree b62575874de5f0bd17afcbb223e07db70b07c3a5
parent 67835c7025b75d97aa1ad76e03407693fa307b57
parent 906aa6821ca80efd77d27b1592dd59054550f7e9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518247240 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518247240 +0000

[automerger] RESTRICT AUTOMERGE Prevent MediaPlayerService::Client's use-after-free am: 0c786be751 am: 2b9a42237e am: 9c02eb201b skipped: 4495da6fd3 am: 906aa6821c

Change-Id: I759d12a79a275e666f84bac77e650cb04fa8601a