OSDN Git Service

Merge "Fix no options menu on location settings screen"
authorqinglian.x.zhang <qinglian.x.zhang@sonymobile.com>
Wed, 23 Mar 2016 16:07:28 +0000 (16:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 16:07:28 +0000 (16:07 +0000)
commit178b198f7053844576e9079c8036c5bb3d52b900
treeac789be3016756a19618a54795919578792bc2e0
parente4991bd6dd3c5be6b3c1326a46b5c66a33602037
parent5c15ff923d6116e7634e7c51cde76ce33ed77368
Merge "Fix no options menu on location settings screen"
am: 5c15ff9

* commit '5c15ff923d6116e7634e7c51cde76ce33ed77368':
  Fix no options menu on location settings screen
src/com/android/settings/location/LocationSettings.java