OSDN Git Service

Merge "Add an app-ops check when registering for location" am: b376f02260 am: be9359343e
authorHall Liu <hallliu@google.com>
Tue, 6 Mar 2018 08:38:22 +0000 (08:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Mar 2018 08:38:22 +0000 (08:38 +0000)
am: 1976c21a7d

Change-Id: I4a2999adb3c3904fddb3dbbfb99395dcad120098


Trivial merge