Merge "Fix radial time picker inner circle (1-12) selections" into lmp-dev

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/widget/RadialTimePickerView.java b/core/java/android/widget/RadialTimePickerView.java
index 046028233f63..56f126cbe447 100644
--- a/core/java/android/widget/RadialTimePickerView.java
+++ b/core/java/android/widget/RadialTimePickerView.java
@@ -557,7 +557,7 @@ public class RadialTimePickerView extends View implements View.OnTouchListener {
             if (mIsOnInnerCircle && hour == 0) {
                 // Inner circle is 1 through 12.
                 hour = 12;
-            } else if (hour != 0) {
+            } else if (!mIsOnInnerCircle && hour != 0) {
                 // Outer circle is 13 through 23 and 0.
                 hour += 12;
             }