OSDN Git Service

Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
authorDavid Stevens <stevensd@google.com>
Wed, 23 Aug 2017 01:58:36 +0000 (01:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 23 Aug 2017 01:58:36 +0000 (01:58 +0000)
commitbc06e43c492f1c8b5e7141fc8ffb2b756f987ecf
tree9ef756160b8cad3a64d926df40116271bc87703c
parent63b3eff31a48b45f785a383093455863f0ef93f5
parent18abd0ef7e64c4c6d27b80670fa8755626764e67
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev