commit 85790044bb41f5d92406cf81e6fd8a28a663494e
author Wenyi Wang <wenyiw@google.com> Mon Jan 25 23:05:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 23:05:02 2016 +0000
tree e283e942da497a5e63f250087ef814c252b3eaf9
parent 0bd219912e709107028851ed0ea607111d925ce0
parent 1149810ef01add3efd669eeb911682a95d317af1

Merge "Move "callblocking" package and BlockedNumbersActivity to src-N" into ub-contactsdialer-b-dev

src-N/com/android/contacts/activities/BlockedNumbersActivity.java

diff --git a/src/com/android/contacts/activities/BlockedNumbersActivity.java b/src-N/com/android/contacts/activities/BlockedNumbersActivity.java
similarity index 100%
rename from src/com/android/contacts/activities/BlockedNumbersActivity.java
rename to src-N/com/android/contacts/activities/BlockedNumbersActivity.java

src-N/com/android/contacts/callblocking/BlockNumberDialogFragment.java

diff --git a/src/com/android/contacts/callblocking/BlockNumberDialogFragment.java b/src-N/com/android/contacts/callblocking/BlockNumberDialogFragment.java
similarity index 100%
rename from src/com/android/contacts/callblocking/BlockNumberDialogFragment.java
rename to src-N/com/android/contacts/callblocking/BlockNumberDialogFragment.java

src-N/com/android/contacts/callblocking/BlockedNumbersAdapter.java

diff --git a/src/com/android/contacts/callblocking/BlockedNumbersAdapter.java b/src-N/com/android/contacts/callblocking/BlockedNumbersAdapter.java
similarity index 100%
rename from src/com/android/contacts/callblocking/BlockedNumbersAdapter.java
rename to src-N/com/android/contacts/callblocking/BlockedNumbersAdapter.java

src-N/com/android/contacts/callblocking/BlockedNumbersFragment.java

diff --git a/src/com/android/contacts/callblocking/BlockedNumbersFragment.java b/src-N/com/android/contacts/callblocking/BlockedNumbersFragment.java
similarity index 100%
rename from src/com/android/contacts/callblocking/BlockedNumbersFragment.java
rename to src-N/com/android/contacts/callblocking/BlockedNumbersFragment.java

src-N/com/android/contacts/callblocking/ContactInfo.java

diff --git a/src/com/android/contacts/callblocking/ContactInfo.java b/src-N/com/android/contacts/callblocking/ContactInfo.java
similarity index 100%
rename from src/com/android/contacts/callblocking/ContactInfo.java
rename to src-N/com/android/contacts/callblocking/ContactInfo.java

src-N/com/android/contacts/callblocking/ContactInfoHelper.java

diff --git a/src/com/android/contacts/callblocking/ContactInfoHelper.java b/src-N/com/android/contacts/callblocking/ContactInfoHelper.java
similarity index 100%
rename from src/com/android/contacts/callblocking/ContactInfoHelper.java
rename to src-N/com/android/contacts/callblocking/ContactInfoHelper.java

src-N/com/android/contacts/callblocking/ContentChangedFilter.java

diff --git a/src/com/android/contacts/callblocking/ContentChangedFilter.java b/src-N/com/android/contacts/callblocking/ContentChangedFilter.java
similarity index 100%
rename from src/com/android/contacts/callblocking/ContentChangedFilter.java
rename to src-N/com/android/contacts/callblocking/ContentChangedFilter.java

src-N/com/android/contacts/callblocking/FilteredNumberAsyncQueryHandler.java

diff --git a/src/com/android/contacts/callblocking/FilteredNumberAsyncQueryHandler.java b/src-N/com/android/contacts/callblocking/FilteredNumberAsyncQueryHandler.java
similarity index 100%
rename from src/com/android/contacts/callblocking/FilteredNumberAsyncQueryHandler.java
rename to src-N/com/android/contacts/callblocking/FilteredNumberAsyncQueryHandler.java

src-N/com/android/contacts/callblocking/FilteredNumbersUtil.java

diff --git a/src/com/android/contacts/callblocking/FilteredNumbersUtil.java b/src-N/com/android/contacts/callblocking/FilteredNumbersUtil.java
similarity index 100%
rename from src/com/android/contacts/callblocking/FilteredNumbersUtil.java
rename to src-N/com/android/contacts/callblocking/FilteredNumbersUtil.java

src-N/com/android/contacts/callblocking/NumbersAdapter.java

diff --git a/src/com/android/contacts/callblocking/NumbersAdapter.java b/src-N/com/android/contacts/callblocking/NumbersAdapter.java
similarity index 100%
rename from src/com/android/contacts/callblocking/NumbersAdapter.java
rename to src-N/com/android/contacts/callblocking/NumbersAdapter.java

src-N/com/android/contacts/callblocking/SearchAdapter.java

diff --git a/src/com/android/contacts/callblocking/SearchAdapter.java b/src-N/com/android/contacts/callblocking/SearchAdapter.java
similarity index 100%
rename from src/com/android/contacts/callblocking/SearchAdapter.java
rename to src-N/com/android/contacts/callblocking/SearchAdapter.java

src-N/com/android/contacts/callblocking/SearchFragment.java

diff --git a/src/com/android/contacts/callblocking/SearchFragment.java b/src-N/com/android/contacts/callblocking/SearchFragment.java
similarity index 100%
rename from src/com/android/contacts/callblocking/SearchFragment.java
rename to src-N/com/android/contacts/callblocking/SearchFragment.java

src-N/com/android/contacts/callblocking/ViewNumbersToImportAdapter.java

diff --git a/src/com/android/contacts/callblocking/ViewNumbersToImportAdapter.java b/src-N/com/android/contacts/callblocking/ViewNumbersToImportAdapter.java
similarity index 100%
rename from src/com/android/contacts/callblocking/ViewNumbersToImportAdapter.java
rename to src-N/com/android/contacts/callblocking/ViewNumbersToImportAdapter.java

src-N/com/android/contacts/callblocking/ViewNumbersToImportFragment.java

diff --git a/src/com/android/contacts/callblocking/ViewNumbersToImportFragment.java b/src-N/com/android/contacts/callblocking/ViewNumbersToImportFragment.java
similarity index 100%
rename from src/com/android/contacts/callblocking/ViewNumbersToImportFragment.java
rename to src-N/com/android/contacts/callblocking/ViewNumbersToImportFragment.java