Revert "clean up last commit"

This reverts commit e112eacfbb935823a8d25a9fd02132e9c32658de.

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: Idb7f6e714e28df640d4c511c20b923b2279f7294
sloppy

Change-Id: I562febb1ff79ee60cb1691db2c3772ca0db555d7
Revert "Telephony: Open source google dialer and more (3/5)"
-potential lawsuit

This reverts commit db47c3c5174e711b3cabab055db5ae14d8bf9eff.

Conflicts:
	res/values/cm_strings.xml
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: I5f81f633e71f9e33f64c7ea43d6f8e3872c26235
derps

Change-Id: I9fb15b448032e08fa6b71a1fdc2c72add721b87f
[2/4] Dialer lookup

Squashed commit of the following:

commit bf8b0ec3d9a12618d829e7aaee010fe738a606c5
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Fri Mar 7 16:50:50 2014 -0500

    Add People Lookup settings

    Change-Id: I8c5fee12af9a66e5a6a80ae06e0ce961ecbbd60e

commit 63fb781f6f65bc1eada5b54162b50f9866a61c60
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Sat Feb 15 13:39:10 2014 -0500

    [2/2] Remove Google Reverse Lookup: Auth may violate terms of service

    Change-Id: I707597fa665e91c531000c9d8765b7befea00b84

commit 92a08eccec05aec77bfbea0888b288d4b8032b1d
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Tue Feb 11 19:10:35 2014 -0500

    [1/2] Telephony: Add setting for YellowPages Canada reverse lookup provider

    Change-Id: I61e531b795ec39585979682829bb1ca448790df9

commit b6bfb4b75efbf79a76a665d2d702aafa1030a913
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Tue Feb 11 00:20:14 2014 -0500

    [1/2] Telephony: Add setting for WhitePages Canada reverse lookup provider

    Change-Id: Icd48aa3fac4cc65d71c326e0fe34f4cecc674cc4

commit 54d9ba633f911bc753cfe3030ca31c1d2d1ddbda
Author: Lars Greiss <kufikugel@googlemail.com>
Date:   Mon Feb 10 17:26:49 2014 +0100

    Telephony: fix reverese lookup gms logic detection

    Logic was reversed so the entry is removed if gms is there and other
    way round.

    Change-Id: Ibad1c3bde8bc0786470f35ee3e5ee5c2401cd4ef

commit 390bbea6a5656b044f56fbc2df48ff62163cc7fc
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Mon Feb 10 11:56:56 2014 -0500

    Use PackageManager to detect of Google Play Services is installed

    Change-Id: I2a411c6078e74e6f28c13d290471e51edd4180fc

commit 70a0384ada44b8bfe696d0fcfff981489f51532c
Author: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
Date:   Fri Jan 31 13:27:50 2014 -0500

    Telephony: Add settings for forward and reverse number lookup

    Change-Id: I96d5b4a455095b40cf25ee39f5cba9fe16e11832

Change-Id: I33873901cf56ef400e0f6bc5e9dc56ed59db6b0d

Conflicts:
	res/values/cm_strings.xml
clean up commit

Change-Id: Id25273b8afff12cd431f0f6db4b30257f5ad6237