diff options
| author | Trevor Johns <tjohns@google.com> | 2009-12-15 15:06:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 15:06:19 -0800 |
| commit | 7a416277107f8ae46831fe8c5501f7e618a37f3e (patch) | |
| tree | 5751d06f3ff10dd2441fc0521fcc08e54e57615f | |
| parent | 050eb28ab512928ddcd38307857e8e6fdbc7b741 (diff) | |
| parent | 55d80586c76580bf6cbc00e9bd89658a72aa985b (diff) | |
| download | android_development-7a416277107f8ae46831fe8c5501f7e618a37f3e.tar.gz android_development-7a416277107f8ae46831fe8c5501f7e618a37f3e.tar.bz2 android_development-7a416277107f8ae46831fe8c5501f7e618a37f3e.zip | |
am 55d80586: am 5dba584a: Merge change Ic3464854 into eclair
Merge commit '55d80586c76580bf6cbc00e9bd89658a72aa985b'
* commit '55d80586c76580bf6cbc00e9bd89658a72aa985b':
Renaming com.google.example.android.contactmanager to com.example.android.contactmanager.
| -rw-r--r-- | samples/ContactManager/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | samples/ContactManager/src/com/example/android/contactmanager/ContactAdder.java (renamed from samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java) | 6 | ||||
| -rw-r--r-- | samples/ContactManager/src/com/example/android/contactmanager/ContactManager.java (renamed from samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java) | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/samples/ContactManager/AndroidManifest.xml b/samples/ContactManager/AndroidManifest.xml index c0a01cd31..abf56695e 100644 --- a/samples/ContactManager/AndroidManifest.xml +++ b/samples/ContactManager/AndroidManifest.xml @@ -15,7 +15,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.example.android.contactmanager" + package="com.example.android.contactmanager" android:versionCode="1" android:versionName="1.0"> <application android:label="@string/app_name" android:icon="@drawable/icon"> <activity android:name=".ContactManager" android:label="@string/app_name"> diff --git a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java b/samples/ContactManager/src/com/example/android/contactmanager/ContactAdder.java index 92ad5a237..3adeaabd9 100644 --- a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java +++ b/samples/ContactManager/src/com/example/android/contactmanager/ContactAdder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.example.android.contactmanager; +package com.example.android.contactmanager; import android.accounts.Account; import android.accounts.AccountManager; @@ -48,9 +48,9 @@ public final class ContactAdder extends Activity implements OnAccountsUpdateList { public static final String TAG = "ContactsAdder"; public static final String ACCOUNT_NAME = - "com.google.example.android.contactmanager.ContactsAdder.ACCOUNT_NAME"; + "com.example.android.contactmanager.ContactsAdder.ACCOUNT_NAME"; public static final String ACCOUNT_TYPE = - "com.google.example.android.contactmanager.ContactsAdder.ACCOUNT_TYPE"; + "com.example.android.contactmanager.ContactsAdder.ACCOUNT_TYPE"; private ArrayList<AccountData> mAccounts; private AccountAdapter mAccountAdapter; diff --git a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java b/samples/ContactManager/src/com/example/android/contactmanager/ContactManager.java index 7b416b084..92c29f8e7 100644 --- a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java +++ b/samples/ContactManager/src/com/example/android/contactmanager/ContactManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.example.android.contactmanager; +package com.example.android.contactmanager; import android.app.Activity; import android.content.Intent; |