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)
commitfbf21f4c857a87a27f19203975c882cf29a59d1a
treefc17bb975ddbfe43d124b435806bf5c169e36b86
parentab86bf82447a5624ebc6881af5312f4c30cc3c41
parent8606c652d5f7d32ab5a011af96e9cd1fc9c108ab
Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
am: 8606c652d5

Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e