tree 62f23ff9397b781ce944e14a6d08705fe6ef667c
parent bfd630d112e70f62c15818f15ba176b62bd5d008
parent c2cc33a70679e841b3f7912319cbfa1c264499f5
author Junyu Lai <junyulai@google.com> 1600922089 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600922089 +0000

Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4 am: 65bcfe173f am: b3692b0365 am: c2cc33a706

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190

Change-Id: I9c7dc3cd59394d0d7bab8efeec08fa066f468927