am 084a1161: am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev

* commit '084a11612dd1b1958f4421315e3929657723f7c9':
  Revert "Update Trusted Credentials screen in settings"
This commit is contained in:
Zoltan Szatmary-Ban
2014-08-07 13:53:10 +00:00
committed by Android Git Automerger
4 changed files with 29 additions and 42 deletions

View File

@@ -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];
}
};
}