OSDN Git Service

Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
authorJason Monk <jmonk@google.com>
Fri, 22 Apr 2016 16:08:55 +0000 (16:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 16:08:55 +0000 (16:08 +0000)
commit7014023f5d291b6bebc0601dd221934c89143716
treefb0d787c81df1083f56a4ed357906ff54c6aa7a2
parent6081857ceaa376b15f1b23ee2b458ccb46715c20
parentaf6236d06f1be85bc52e04e9cad8478035a677ab
Merge "Don\'t link to MobileNetworkSettings unless admin user" into nyc-dev
am: af6236d06f

* commit 'af6236d06f1be85bc52e04e9cad8478035a677ab':
  Don't link to MobileNetworkSettings unless admin user

Change-Id: I627072a521c4633abe6f2493ff641aea78ad5b86