OSDN Git Service

Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
authorChristine Franks <christyfranks@google.com>
Thu, 6 Apr 2017 17:19:25 +0000 (17:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 17:19:25 +0000 (17:19 +0000)
am: 8606c652d5

Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e


Trivial merge