Merge branch 'hotfix/1.6.2'

pull/201/head v1.6.2
Alinson S. Xavier 9 years ago
commit 967dc2586b

@ -21,8 +21,8 @@
<manifest <manifest
package="org.isoron.uhabits" package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="24" android:versionCode="25"
android:versionName="1.6.1"> android:versionName="1.6.2">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

@ -44,7 +44,7 @@ public class DateFormats
{ {
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
if (SDK_INT >= JELLY_BEAN) if (SDK_INT >= JELLY_BEAN_MR2)
skeleton = getBestDateTimePattern(locale, skeleton); skeleton = getBestDateTimePattern(locale, skeleton);
return fromSkeleton(skeleton, locale); return fromSkeleton(skeleton, locale);

Loading…
Cancel
Save