OSDN Git Service

Resolve merge conflicts of b9e837bc78 to nyc-dev am: 7e6eec5b87
authorSanket Padawe <sanketpadawe@google.com>
Mon, 29 Feb 2016 19:17:57 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Feb 2016 19:17:57 +0000 (19:17 +0000)
commit0ea43574457a780cc95871b2e1f62171b1064582
treea7d1d0ff0010c27809040d22362b743b57f8163d
parentbf075ebab04bb5c3d8b5f43df943db4f3d98c8ae
parent71b73695bd5c434fdf5d6789ba92f84fe54570a2
Resolve merge conflicts of b9e837bc78 to nyc-dev am: 7e6eec5b87
am: 71b73695bd

* commit '71b73695bd5c434fdf5d6789ba92f84fe54570a2':
  Remove displaying of WifiCalling twice in Settings search.