tree 3a0e35d751a94716de0020fa4fa2d67434ed753a
parent 5ee542e401a591ce08aa143933e3261b47853542
parent 5f25789be20344f4324302dabc1151287cc06449
author Winson Chung <winsonc@google.com> 1564001174 -0700
committer android-build-merger <android-build-merger@google.com> 1564001174 -0700

[automerger skipped] Copy resume callbacks list prior to making callbacks am: a8971c1462 am: e5e34a7c91 -s ours am: 1db88426aa -s ours
am: 5f25789be2 -s ours
am skip reason: change_id I6690ab0695bb73f11bf343fb41e9fc86b4afec1b with SHA1 a8971c1462 is in history

Change-Id: I74b188b7b293b6f0f81fcfec4ccf7288839592a3