| commit | b6b193013d4641cbbf0170c98aebc5c3f6a2214b | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 04 16:01:22 2010 -0700 |
| tree | eab55d5c70f026a74de0ce36362e9efe03c02a3d | |
| parent | e799720dd478c60ac027d296f329b469119d1c1c [diff] | |
| parent | 3dd101133a4cf0247ee9f2665abc360a134d0665 [diff] |
Merge "resolved conflicts for merge of 242fa52b to master"
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png index 53ed136..abb91cc 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_gray.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png index 6455790..7c4f40e 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_green.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png index 49bb9c1..6dbf925 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_red.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png index b3c4c4c..b05a49f 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_confirm_yellow.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png index 00dea6ec..109be42 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_normal.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png index 45b1850..2800cab 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_left_end_pressed.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png index 35b3529..51cbfa6 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_gray.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png index 720de7f..ca51ccc 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_green.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png index b3387be..fd98571 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_red.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png index 7ddfbcc..723815b 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_confirm_yellow.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png index 1855e5f..030c9e9 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_normal.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png index 844f304..ffc5433 100644 --- a/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png +++ b/core/res/res/drawable-hdpi/jog_tab_bar_right_end_pressed.9.png Binary files differ
