diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-14 14:49:58 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-10-14 14:49:58 -0400 |
| commit | cf2d725b554d1af322e3f2139d52f08b00a47ad3 (patch) | |
| tree | a1cbf79f1da66481c3ba01ac61b2a0c45944f754 /core/res/res/values-land | |
| parent | f3bd8d4843dc811a29854bdb11ce6ea2b2834e9c (diff) | |
| parent | f1dd32c84f102de3f78b19b5b67692347347ec84 (diff) | |
| download | frameworks_base-cf2d725b554d1af322e3f2139d52f08b00a47ad3.zip frameworks_base-cf2d725b554d1af322e3f2139d52f08b00a47ad3.tar.gz frameworks_base-cf2d725b554d1af322e3f2139d52f08b00a47ad3.tar.bz2 | |
resolved conflicts for merge of f1dd32c8 to master
Change-Id: Ied96bfce952fa95eeceb1b8cf64e53830d4d03ac
Diffstat (limited to 'core/res/res/values-land')
| -rw-r--r-- | core/res/res/values-land/dimens.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values-land/dimens.xml b/core/res/res/values-land/dimens.xml index 4e36591..640ca1e 100644 --- a/core/res/res/values-land/dimens.xml +++ b/core/res/res/values-land/dimens.xml @@ -64,7 +64,7 @@ <!-- New TimePicker dimensions. --> <dimen name="timepicker_left_side_width">250dip</dimen> - <!-- width of TransientNavigationConfirmation (-1 for match_parent) --> + <!-- width of ImmersiveModeConfirmation (-1 for match_parent) --> <dimen name="immersive_mode_cling_width">380dp</dimen> </resources> |