OSDN Git Service

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

Change-Id: Ie410feec95b77b5c97b19e35a3b3642df1f062db


Trivial merge