OSDN Git Service

Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev
authorChristopher Tate <ctate@google.com>
Fri, 1 Sep 2017 22:30:49 +0000 (22:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Sep 2017 22:30:49 +0000 (22:30 +0000)
am: 9f9ee61cf6

Change-Id: I07387dbbdf90138d06eaf7c14705946dd4ab2fc5


Trivial merge