tree 3a0e35d751a94716de0020fa4fa2d67434ed753a
parent 113dd9d24ea46e597eff0ab9b3b05513e5bb58ed
parent 17f8e0789a2274f580d4254323f5b8678af7fe69
author Winson Chung <winsonc@google.com> 1563999455 -0700
committer android-build-merger <android-build-merger@google.com> 1563999455 -0700

[automerger skipped] Copy resume callbacks list prior to making callbacks am: a8971c1462 -s ours am: 4f68901b5b -s ours
am: 17f8e0789a -s ours
am skip reason: change_id I6690ab0695bb73f11bf343fb41e9fc86b4afec1b with SHA1 a8971c1462 is in history

Change-Id: Ic70ca9ebe3ed21b59b92da0cb262872b1ea5881d