summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-08-15 12:35:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-15 04:54:19 +0000
commitbdc78678dedc6b66b9584948b908cd8cf77c6b30 (patch)
tree7fe3145e6dbc6e35be1ce083e6128a40e1ee015b /core
parent5dc4a440d17a15a1717c7c70a66e012bce6bb25c (diff)
parentf75aadc028f2e79541a269bf2c74dcb3482e2ec7 (diff)
downloadframeworks_base-bdc78678dedc6b66b9584948b908cd8cf77c6b30.zip
frameworks_base-bdc78678dedc6b66b9584948b908cd8cf77c6b30.tar.gz
frameworks_base-bdc78678dedc6b66b9584948b908cd8cf77c6b30.tar.bz2
Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/util/ParcelableString.java32
1 files changed, 0 insertions, 32 deletions
diff --git a/core/java/com/android/internal/util/ParcelableString.java b/core/java/com/android/internal/util/ParcelableString.java
deleted file mode 100644
index 472ae86..0000000
--- a/core/java/com/android/internal/util/ParcelableString.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.android.internal.util;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class ParcelableString implements Parcelable {
- public String string;
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel out, int flags) {
- out.writeString(string);
- }
-
- public static final Parcelable.Creator<ParcelableString> CREATOR =
- new Parcelable.Creator<ParcelableString>() {
- @Override
- public ParcelableString createFromParcel(Parcel in) {
- ParcelableString ret = new ParcelableString();
- ret.string = in.readString();
- return ret;
- }
- @Override
- public ParcelableString[] newArray(int size) {
- return new ParcelableString[size];
- }
- };
-}