OSDN Git Service

Merge "Prevent apps from displaying over Settings" into oc-dev
authorChristine Franks <christyfranks@google.com>
Thu, 6 Apr 2017 16:47:52 +0000 (16:47 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Apr 2017 16:47:53 +0000 (16:47 +0000)

Trivial merge