Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of aa9c9fb29e to nyc-dev

Browse Source 
am: 16e17a7730

* commit '16e17a77301a8b8d46d5762d301fc29ceb0673ab':
  Replace SimpleDateFormat implementation
This commit is contained in:
Diego Perez
2016-02-18 19:01:42 +00:00
committed by android-build-merger
parent 060838dcfc 16e17a7730
commit d172cae5f9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
View File

@@ -308,6 +308,10 @@ public final class CreateInfo implements ICreateInfo {
"java.nio.charset.Charsets", "java.nio.charset.StandardCharsets",
"java.lang.IntegralToString", "com.android.tools.layoutlib.java.IntegralToString",
"java.lang.UnsafeByteSequence", "com.android.tools.layoutlib.java.UnsafeByteSequence",
// Use android.icu.text versions of DateFormat and SimpleDateFormat since the
// original ones do not match the Android implementation
"java.text.DateFormat", "android.icu.text.DateFormat",
"java.text.SimpleDateFormat", "android.icu.text.SimpleDateFormat"
};
private final static String[] EXCLUDED_CLASSES =