OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9bd7b0 7e6eec5)
Resolve merge conflicts of b9e837bc78 to nyc-dev
authorSanket Padawe <sanketpadawe@google.com>
Mon, 29 Feb 2016 19:14:52 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Feb 2016 19:14:52 +0000 (19:14 +0000)
am: 7e6eec5b87

* commit '7e6eec5b87ba5ba34f63f7ba99ad911d54729d87':
  Remove displaying of WifiCalling twice in Settings search.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help