ed9d955576d03b8e234be51b881302f0f273a35e - platform/packages/apps/ContactsCommon

commit	ed9d955576d03b8e234be51b881302f0f273a35e	[log] [tgz]
author	Wenyi Wang <wenyiw@google.com>	Mon Jun 27 12:43:31 2016 -0700
committer	Walter Jang <wjang@google.com>	Wed Jul 13 16:52:00 2016 -0700
tree	4de1ee454ebcc12984d1ca042b23480ff39ef280
parent	f9da28a78688b7480e3183d34ec2232a6cb9921a [diff]

Merge contacts src-N/ and src-pre-N/ dirs (2/3)

Bug 30124466

(cherry picked from commit 68378150328d720af5c084ae04b3007ce4118a63)

Change-Id: Idcb3fb3a1cb571b5d3575ca3d55f0f84bc20eb31

src-N/com/android/contacts/common/compat/BlockedNumberContractCompat.java[Deleted - diff]
src-N/com/android/contacts/common/compat/CallSdkCompat.java[Deleted - diff]
src-N/com/android/contacts/common/compat/MetadataSyncEnabledCompat.java[Deleted - diff]
src-N/com/android/contacts/common/compat/PhoneLookupSdkCompat.java[Deleted - diff]
src-N/com/android/contacts/common/compat/SdkSelectionUtils.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/BlockedNumberContractCompat.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/CallSdkCompat.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/DirectorySdkCompat.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/MultiWindowCompat.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/PhoneAccountSdkCompat.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/SdkSelectionUtils.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/TelecomManagerUtil.java[Deleted - diff]
src-pre-N/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java[Deleted - diff]
src/com/android/contacts/common/ContactsUtils.java[diff]
src/com/android/contacts/common/compat/CallSdkCompat.java[Added - diff]
src/com/android/contacts/common/compat/CompatUtils.java[diff]
src/com/android/contacts/common/compat/DirectorySdkCompat.java[Renamed from src-N/com/android/contacts/common/compat/DirectorySdkCompat.java - diff]
src/com/android/contacts/common/compat/MetadataSyncEnabledCompat.java[Renamed from src-pre-N/com/android/contacts/common/compat/MetadataSyncEnabledCompat.java - diff]
src/com/android/contacts/common/compat/MultiWindowCompat.java[Renamed from src-N/com/android/contacts/common/compat/MultiWindowCompat.java - diff]
src/com/android/contacts/common/compat/PhoneAccountSdkCompat.java[Renamed from src-N/com/android/contacts/common/compat/PhoneAccountSdkCompat.java - diff]
src/com/android/contacts/common/compat/PhoneLookupSdkCompat.java[Renamed from src-pre-N/com/android/contacts/common/compat/PhoneLookupSdkCompat.java - diff]
src/com/android/contacts/common/compat/TelecomManagerUtil.java[Renamed from src-N/com/android/contacts/common/compat/TelecomManagerUtil.java - diff]
src/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java[Renamed from src-N/com/android/contacts/common/compat/TelephonyManagerSdkCompat.java - diff]
src/com/android/contacts/common/preference/DisplayOptionsPreferenceFragment.java[diff]
tests/src-N/com/android/contacts/common/compat/SdkSelectionUtilsTest.java[Deleted - diff]
tests/src-pre-N/com/android/contacts/common/compat/SdkSelectionUtilsTest.java[Deleted - diff]

26 files changed

tree: 4de1ee454ebcc12984d1ca042b23480ff39ef280