OSDN Git Service

Merge "Introduce a new user restriction for disallowing Bluetooth."
authorltrochtova <ltrochtova@google.com>
Thu, 1 Dec 2016 21:31:23 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Dec 2016 21:31:23 +0000 (21:31 +0000)
am: 1e9a5eac92  -s ours

Change-Id: I35d19d46b8edbacb66613e11a398c742f9d37029


Trivial merge