OSDN Git Service

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)
commit71b73695bd5c434fdf5d6789ba92f84fe54570a2
treedc4efff872847a8ff128513a11123551db1d4063
parentd9bd7b032422c2bdb0ec8cb47b28f1b28f681550
parent7e6eec5b87ba5ba34f63f7ba99ad911d54729d87
Resolve merge conflicts of b9e837bc78 to nyc-dev
am: 7e6eec5b87

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