tree 32d64197a861fb461caf1616c72bb87bb072f6f6
parent 4764f7b5b55f5e2f9bdfbd2a6627756be7b8c457
parent 630a49aa4ea7e5452d88a7cffa207386760e9ad4
author Christopher Tate <ctate@google.com> 1497390440 +0000
committer android-build-merger <android-build-merger@google.com> 1497390440 +0000

Merge "Send ACTION_SHUTDOWN broadcast to manifest receivers" into oc-dev
am: 630a49aa4e

Change-Id: I2fc48a0117c021ed415ecb06efffb2e41ce567a1