diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-05 23:30:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-05 23:30:18 +0000 |
| commit | 9c8f8ed8a8bee42ee48a27b055b11ace6255d09a (patch) | |
| tree | 9a5a5e9e01cbde137a00f13630fcbf281ccd1c89 /core/java/android/widget | |
| parent | 24bc8d761ae525f82dcaeee576ae238ab3a2de03 (diff) | |
| parent | 4a5baeaec9294dbb43fe3b36a44b3176101756b6 (diff) | |
am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev
* commit '4a5baeaec9294dbb43fe3b36a44b3176101756b6':
resolved conflicts for a0bc2e7e to lmp-mr1-dev
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/TimePickerClockDelegate.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/TimePickerClockDelegate.java b/core/java/android/widget/TimePickerClockDelegate.java index b70595a9da43..15344290cba9 100644 --- a/core/java/android/widget/TimePickerClockDelegate.java +++ b/core/java/android/widget/TimePickerClockDelegate.java @@ -63,6 +63,8 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate impl // Also NOT a real index, just used for keyboard mode. private static final int ENABLE_PICKER_INDEX = 3; + // LayoutLib relies on these constants. Change TimePickerClockDelegate_Delegate if + // modifying these. static final int AM = 0; static final int PM = 1; |