tree a1ab93ad23143900069d82511ab036a6957a6815
parent 2b62cab4240993a2565940b9adffe11b85a2d8cb
parent 346892b4aec30fe4d9b5a7c9ebb5dfcac6717176
author Evan Laird <evanlaird@google.com> 1524509863 -0700
committer android-build-merger <android-build-merger@google.com> 1524509863 -0700

Merge "Actually read config_showActivity in the signal policy" into pi-dev am: 42b5621e12
am: 346892b4ae

Change-Id: Id341dd97e5d7699a625fc192af5caa6f3abfe2cf