| commit | c2cc33a70679e841b3f7912319cbfa1c264499f5 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Thu Sep 24 04:19:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 24 04:19:43 2020 +0000 |
| tree | 96a7fc50c60668e94ef2d2f6242d8a0d91c60113 | |
| parent | ee6c5882a13fa8ec693941ce8aefcf98a711db75 [diff] | |
| parent | b3692b03651bb2ffac024a0e5fde27ba36266ba9 [diff] |
Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4 am: 65bcfe173f am: b3692b0365 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190 Change-Id: I0d55c6f7e876a786cbe7f301d0caecbe6456af36