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)

Trivial merge