Commit Graph

8525 Commits

Author SHA1 Message Date
Sriram Ramasubramanian
23f2aba285 Bug 843313: Make a StateListDrawable for more/checkmark in menuitem. [r=mfinkle]
--HG--
rename : mobile/android/base/resources/drawable/menu_item_checkmark.xml => mobile/android/base/resources/drawable/menu_item_state.xml.in
2013-02-20 23:07:07 -08:00
Sriram Ramasubramanian
a15a55cf42 Bug 843313: Remove the unnecessary LinearLayout around the TextView in default menu item. [r=mfinkle] 2013-02-20 23:07:06 -08:00
Sriram Ramasubramanian
38bde99563 Bug 843314: Addon without icons should show a filler. [r=mfinkle] 2013-02-20 23:07:06 -08:00
Sriram Ramasubramanian
f6c705b177 Bug 843313: Make the checkbox/more icon to be a compound drawable of the menu item's text. [r=mfinkle] 2013-02-20 23:07:06 -08:00
Sriram Ramasubramanian
5c3649a74c Bug 843313: Make the icon a compound drawable for the menu-item's text. [r=mfinkle] 2013-02-20 23:07:05 -08:00
Panos Astithas
0dc80bb350 Bug 818382 - Support chrome debugging in Firefox for Android; r=mfinkle 2013-02-21 08:44:03 +02:00
Mark Finkle
bebe593801 Bug 843029 - Add more retries to ensureDatabaseIsNotLocked r=blassey r=lucasr 2013-02-20 13:32:35 -05:00
Mark Finkle
377ebd2f97 Bug 842917 - Avoid nested transactions in onUpgrade r=lucasr 2013-02-20 13:32:32 -05:00
Adrian Tamas
67f3f94f14 Bug 841377 - Robocop: Extend the testShareLink test to cover opening the share popup from context menus. r=jmaher 2013-02-12 10:00:54 +02:00
Mike Hommey
23172848d9 Bug 834337 - Make chrome/chrome/content/branding/favicon64.png the first file in omni.ja. r=blassey 2013-02-20 09:53:21 +01:00
Richard Newman
c2f4f87753 Bug 842674 - Use correct constant for android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE. r=nalexander 2013-02-19 15:13:01 -08:00
Mark Finkle
93ffa5b5e5 Bug 842421 - Make GeckoAsyncTask cancellable r=kats r=bnicholson 2013-02-19 16:14:37 -05:00
Mark Finkle
104376daeb Bug 842374 - Use GeckoAsyncTask instead of AsyncTask when removing bookmarks r=kats 2013-02-19 16:14:35 -05:00
Kartikaya Gupta
9aae1a8e20 Back out b3bdec87d963 (bug 840722) for causing bug 842418. r=me 2013-02-19 16:11:03 -05:00
Mark Finkle
168d33d001 Bug 842457 - Limit columns in queries used for getCount r=bnicholson 2013-02-19 15:53:03 -05:00
Sriram Ramasubramanian
e729e71afc Bug 840871: TabsPanel is not needed to be shown right on startup. [r=mfinkle] 2013-02-19 12:39:05 -08:00
Sriram Ramasubramanian
6337bf56cb Bug 840871: about:home thumbnails are drawn twice. [r=mfinkle] 2013-02-19 12:00:28 -08:00
Sriram Ramasubramanian
ce76b3ad60 Bug 840868: Reset window background once loaded. [r=mfinkle] 2013-02-19 11:54:40 -08:00
Margaret Leibovic
57d3dff4c8 Bug 840825 - Clear distribution pref during testDistribution setup. r=wesj 2013-02-19 10:49:42 -08:00
Geoff Brown
497bdb0569 Bug 837318: Update testVkbOverlap to account for tablet behavior; r=wesj 2013-02-19 12:02:15 -07:00
Margaret Leibovic
b8644f7bb6 Bug 840825 - Basic tests for distribution customization. r=gbrown,wesj 2013-02-19 10:15:55 -08:00
Ryan VanderMeulen
4aa6da6a4f Merge m-c to inbound. 2013-02-19 12:46:19 -05:00
Lukas Blakk
4c259b985a Merging in version bump NO BUG CLOSED TREE 2013-02-19 09:35:19 -08:00
Morrison Cole
6d293830e7 Bug 842346 - Fennec doesn't build with Java 7 because of JavaAddonManager. r=kats 2013-02-19 10:25:13 -05:00
Mark Finkle
c281dd1e25 Bug 836924 - java.lang.NullPointerException: at org.mozilla.gecko.Tabs.getContentResolver r=bnicholson 2013-02-18 16:17:54 -05:00
Jim Chen
e80d4a0b77 Bug 841036 - Set default composition color to text field color; r=cpeterson 2013-02-18 14:00:47 -05:00
Jim Chen
168f35f003 Bug 838177 - Add more debugging output to GeckoEditable and GeckoInputConnection; r=cpeterson 2013-02-18 13:57:43 -05:00
Margaret Leibovic
5337236fe5 Bug 841938 - Implement nsAndroidHistory::SetURITitle. r=wesj 2013-02-18 09:27:30 -08:00
David Dahl
406eda85db Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - revert nsIWindowCrypto patch - r=jst 2013-02-16 22:43:19 -06:00
David Dahl
5ccb7367b2 Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch - r=jst
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-16 22:43:16 -06:00
Ms2ger
231f353ea0 Merge backout on a CLOSED TREE. 2013-02-16 10:36:31 +01:00
Ms2ger
9247adf0cd Backout bug 828349, bug 835022 for robocop orange and exception from Tabs.getDisplayCount. 2013-02-16 10:36:05 +01:00
Brian Nicholson
6f765043db Bug 835022 - Switch to correct tab when a tab is closed. r=mfinkle 2013-02-15 22:44:14 -08:00
Brian Nicholson
fe00e50ca9 Bug 828349 - Return the tab count of the current private state. r=mfinkle 2013-02-15 22:42:12 -08:00
David Dahl
0bfba29ba5 Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - revert nsIWindowCrypto patch r=jst 2013-02-15 23:34:18 -06:00
David Dahl
cb2e8d0515 Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch r=jst
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-15 23:34:15 -06:00
Phil Ringnalda
604c8641a6 Back out 236ba87c0a9f (bug 440046) and d3b7606d94a6:895a7efc978d (bug 683262) for b2g mochitest failures 2013-02-15 23:33:45 -08:00
Shih-Chiang Chien
6bf0fdfc35 Bug 752982 - Part 1, implement captive portal detection service. r=thinker,dolske rs=dolske a=shira. 2013-02-15 23:41:35 +08:00
Sriram Ramasubramanian
bda89e419a Bug 841567: Make the opacity behind the thumbnail title better. [r=mfinkle]
--HG--
extra : rebase_source : 42317c3481401aa86582dbc39085a22069287ef8
2013-02-15 12:51:30 -08:00
Kartikaya Gupta
02904237fe Bug 841810 - Allow java addons to receive and respond to events. r=mfinkle 2013-02-15 15:21:41 -05:00
Tetsuharu OHZEKI
ff4ae413b9 Bug 840722 - Add an object which represents the viewport metadata in browser.js.r=kats 2013-02-15 15:20:52 -05:00
Richard Newman
3be489d5ea Bug 838416 - Defend against insane clocks. r=nalexander 2013-02-14 13:50:37 -08:00
Mark Capella
9723a3250f Bug 837815 - Reading list button opens Top Sites, not Reading List, r=wesj 2013-02-14 21:18:30 -05:00
Gregor Wagner
c5332723a0 Bug 752982: Backout c144a6760459 on CLOSED TREE 2013-02-14 20:10:16 -08:00
Sriram Ramasubramanian
c26bd170de Bug 834082: Move PNG files from drawable to drawable-mdpi. [r=bnicholson] [needs-clobber]
--HG--
rename : mobile/android/base/resources/drawable/abouthome_icon.png => mobile/android/base/resources/drawable-mdpi/abouthome_icon.png
rename : mobile/android/base/resources/drawable/abouthome_logo_dark.png => mobile/android/base/resources/drawable-mdpi/abouthome_logo_dark.png
rename : mobile/android/base/resources/drawable/abouthome_logo_light.png => mobile/android/base/resources/drawable-mdpi/abouthome_logo_light.png
rename : mobile/android/base/resources/drawable/abouthome_promo_box_bg.9.png => mobile/android/base/resources/drawable-mdpi/abouthome_promo_box_bg.9.png
rename : mobile/android/base/resources/drawable/abouthome_promo_box_pressed_bg.9.png => mobile/android/base/resources/drawable-mdpi/abouthome_promo_box_pressed_bg.9.png
rename : mobile/android/base/resources/drawable/abouthome_promo_logo_apps.png => mobile/android/base/resources/drawable-mdpi/abouthome_promo_logo_apps.png
rename : mobile/android/base/resources/drawable/abouthome_promo_logo_sync.png => mobile/android/base/resources/drawable-mdpi/abouthome_promo_logo_sync.png
rename : mobile/android/base/resources/drawable/abouthome_thumbnail.png => mobile/android/base/resources/drawable-mdpi/abouthome_thumbnail.png
rename : mobile/android/base/resources/drawable/abouthome_thumbnail_add.png => mobile/android/base/resources/drawable-mdpi/abouthome_thumbnail_add.png
rename : mobile/android/base/resources/drawable/abouthome_thumbnail_bg.png => mobile/android/base/resources/drawable-mdpi/abouthome_thumbnail_bg.png
rename : mobile/android/base/resources/drawable/address_bar_bg_shadow.png => mobile/android/base/resources/drawable-mdpi/address_bar_bg_shadow.png
rename : mobile/android/base/resources/drawable/address_bar_url_default.9.png => mobile/android/base/resources/drawable-mdpi/address_bar_url_default.9.png
rename : mobile/android/base/resources/drawable/address_bar_url_default_pb.9.png => mobile/android/base/resources/drawable-mdpi/address_bar_url_default_pb.9.png
rename : mobile/android/base/resources/drawable/address_bar_url_pressed.9.png => mobile/android/base/resources/drawable-mdpi/address_bar_url_pressed.9.png
rename : mobile/android/base/resources/drawable/address_bar_url_pressed_pb.9.png => mobile/android/base/resources/drawable-mdpi/address_bar_url_pressed_pb.9.png
rename : mobile/android/base/resources/drawable/alert_addon.png => mobile/android/base/resources/drawable-mdpi/alert_addon.png
rename : mobile/android/base/resources/drawable/alert_app.png => mobile/android/base/resources/drawable-mdpi/alert_app.png
rename : mobile/android/base/resources/drawable/alert_download.png => mobile/android/base/resources/drawable-mdpi/alert_download.png
rename : mobile/android/base/resources/drawable/appwidget_bg.9.png => mobile/android/base/resources/drawable-mdpi/appwidget_bg.9.png
rename : mobile/android/base/resources/drawable/autocomplete_list_bg.9.png => mobile/android/base/resources/drawable-mdpi/autocomplete_list_bg.9.png
rename : mobile/android/base/resources/drawable/awesomebar_tab_center.9.png => mobile/android/base/resources/drawable-mdpi/awesomebar_tab_center.9.png
rename : mobile/android/base/resources/drawable/awesomebar_tab_left.9.png => mobile/android/base/resources/drawable-mdpi/awesomebar_tab_left.9.png
rename : mobile/android/base/resources/drawable/awesomebar_tab_right.9.png => mobile/android/base/resources/drawable-mdpi/awesomebar_tab_right.9.png
rename : mobile/android/base/resources/drawable/bookmarkdefaults_favicon_addons.png => mobile/android/base/resources/drawable-mdpi/bookmarkdefaults_favicon_addons.png
rename : mobile/android/base/resources/drawable/bookmarkdefaults_favicon_support.png => mobile/android/base/resources/drawable-mdpi/bookmarkdefaults_favicon_support.png
rename : mobile/android/base/resources/drawable/crash_reporter.png => mobile/android/base/resources/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/drawable/desktop_notification.png => mobile/android/base/resources/drawable-mdpi/desktop_notification.png
rename : mobile/android/base/resources/drawable/doorhanger_arrow.png => mobile/android/base/resources/drawable-mdpi/doorhanger_arrow.png
rename : mobile/android/base/resources/drawable/doorhanger_bg.9.png => mobile/android/base/resources/drawable-mdpi/doorhanger_bg.9.png
rename : mobile/android/base/resources/drawable/doorhanger_popup_bg.9.png => mobile/android/base/resources/drawable-mdpi/doorhanger_popup_bg.9.png
rename : mobile/android/base/resources/drawable/doorhanger_shadow_bg.9.png => mobile/android/base/resources/drawable-mdpi/doorhanger_shadow_bg.9.png
rename : mobile/android/base/resources/drawable/favicon.png => mobile/android/base/resources/drawable-mdpi/favicon.png
rename : mobile/android/base/resources/drawable/find_close.png => mobile/android/base/resources/drawable-mdpi/find_close.png
rename : mobile/android/base/resources/drawable/find_next.png => mobile/android/base/resources/drawable-mdpi/find_next.png
rename : mobile/android/base/resources/drawable/find_prev.png => mobile/android/base/resources/drawable-mdpi/find_prev.png
rename : mobile/android/base/resources/drawable/folder.png => mobile/android/base/resources/drawable-mdpi/folder.png
rename : mobile/android/base/resources/drawable/handle_end.png => mobile/android/base/resources/drawable-mdpi/handle_end.png
rename : mobile/android/base/resources/drawable/handle_middle.png => mobile/android/base/resources/drawable-mdpi/handle_middle.png
rename : mobile/android/base/resources/drawable/handle_start.png => mobile/android/base/resources/drawable-mdpi/handle_start.png
rename : mobile/android/base/resources/drawable/ic_addons_empty.png => mobile/android/base/resources/drawable-mdpi/ic_addons_empty.png
rename : mobile/android/base/resources/drawable/ic_awesomebar_go.png => mobile/android/base/resources/drawable-mdpi/ic_awesomebar_go.png
rename : mobile/android/base/resources/drawable/ic_awesomebar_reader.png => mobile/android/base/resources/drawable-mdpi/ic_awesomebar_reader.png
rename : mobile/android/base/resources/drawable/ic_awesomebar_search.png => mobile/android/base/resources/drawable-mdpi/ic_awesomebar_search.png
rename : mobile/android/base/resources/drawable/ic_awesomebar_star.png => mobile/android/base/resources/drawable-mdpi/ic_awesomebar_star.png
rename : mobile/android/base/resources/drawable/ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/ic_menu_bookmark_add.png
rename : mobile/android/base/resources/drawable/ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-mdpi/ic_menu_bookmark_remove.png
rename : mobile/android/base/resources/drawable/ic_menu_close_all_tabs.png => mobile/android/base/resources/drawable-mdpi/ic_menu_close_all_tabs.png
rename : mobile/android/base/resources/drawable/ic_menu_forward.png => mobile/android/base/resources/drawable-mdpi/ic_menu_forward.png
rename : mobile/android/base/resources/drawable/ic_menu_new_private_tab.png => mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab.png
rename : mobile/android/base/resources/drawable/ic_menu_new_private_tab_small.png => mobile/android/base/resources/drawable-mdpi/ic_menu_new_private_tab_small.png
rename : mobile/android/base/resources/drawable/ic_menu_new_tab.png => mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab.png
rename : mobile/android/base/resources/drawable/ic_menu_new_tab_small.png => mobile/android/base/resources/drawable-mdpi/ic_menu_new_tab_small.png
rename : mobile/android/base/resources/drawable/ic_menu_reload.png => mobile/android/base/resources/drawable-mdpi/ic_menu_reload.png
rename : mobile/android/base/resources/drawable/ic_status_logo.png => mobile/android/base/resources/drawable-mdpi/ic_status_logo.png
rename : mobile/android/base/resources/drawable/larry_blue.png => mobile/android/base/resources/drawable-mdpi/larry_blue.png
rename : mobile/android/base/resources/drawable/larry_green.png => mobile/android/base/resources/drawable-mdpi/larry_green.png
rename : mobile/android/base/resources/drawable/marketplace.png => mobile/android/base/resources/drawable-mdpi/marketplace.png
rename : mobile/android/base/resources/drawable/menu.png => mobile/android/base/resources/drawable-mdpi/menu.png
rename : mobile/android/base/resources/drawable/menu_item_check.png => mobile/android/base/resources/drawable-mdpi/menu_item_check.png
rename : mobile/android/base/resources/drawable/menu_item_more.png => mobile/android/base/resources/drawable-mdpi/menu_item_more.png
rename : mobile/android/base/resources/drawable/menu_item_uncheck.png => mobile/android/base/resources/drawable-mdpi/menu_item_uncheck.png
rename : mobile/android/base/resources/drawable/menu_panel_bg.9.png => mobile/android/base/resources/drawable-mdpi/menu_panel_bg.9.png
rename : mobile/android/base/resources/drawable/menu_pb.png => mobile/android/base/resources/drawable-mdpi/menu_pb.png
rename : mobile/android/base/resources/drawable/menu_popup_arrow_bottom.png => mobile/android/base/resources/drawable-mdpi/menu_popup_arrow_bottom.png
rename : mobile/android/base/resources/drawable/menu_popup_arrow_top.png => mobile/android/base/resources/drawable-mdpi/menu_popup_arrow_top.png
rename : mobile/android/base/resources/drawable/menu_popup_bg.9.png => mobile/android/base/resources/drawable-mdpi/menu_popup_bg.9.png
rename : mobile/android/base/resources/drawable/progress_spinner_1.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_1.png
rename : mobile/android/base/resources/drawable/progress_spinner_10.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_10.png
rename : mobile/android/base/resources/drawable/progress_spinner_11.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_11.png
rename : mobile/android/base/resources/drawable/progress_spinner_12.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_12.png
rename : mobile/android/base/resources/drawable/progress_spinner_2.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_2.png
rename : mobile/android/base/resources/drawable/progress_spinner_3.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_3.png
rename : mobile/android/base/resources/drawable/progress_spinner_4.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_4.png
rename : mobile/android/base/resources/drawable/progress_spinner_5.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_5.png
rename : mobile/android/base/resources/drawable/progress_spinner_6.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_6.png
rename : mobile/android/base/resources/drawable/progress_spinner_7.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_7.png
rename : mobile/android/base/resources/drawable/progress_spinner_8.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_8.png
rename : mobile/android/base/resources/drawable/progress_spinner_9.png => mobile/android/base/resources/drawable-mdpi/progress_spinner_9.png
rename : mobile/android/base/resources/drawable/reader.png => mobile/android/base/resources/drawable-mdpi/reader.png
rename : mobile/android/base/resources/drawable/reading_list.png => mobile/android/base/resources/drawable-mdpi/reading_list.png
rename : mobile/android/base/resources/drawable/scrollbar.png => mobile/android/base/resources/drawable-mdpi/scrollbar.png
rename : mobile/android/base/resources/drawable/shadow.png => mobile/android/base/resources/drawable-mdpi/shadow.png
rename : mobile/android/base/resources/drawable/site_security_identified.png => mobile/android/base/resources/drawable-mdpi/site_security_identified.png
rename : mobile/android/base/resources/drawable/site_security_verified.png => mobile/android/base/resources/drawable-mdpi/site_security_verified.png
rename : mobile/android/base/resources/drawable/spinner_default.9.png => mobile/android/base/resources/drawable-mdpi/spinner_default.9.png
rename : mobile/android/base/resources/drawable/spinner_focused.9.png => mobile/android/base/resources/drawable-mdpi/spinner_focused.9.png
rename : mobile/android/base/resources/drawable/spinner_pressed.9.png => mobile/android/base/resources/drawable-mdpi/spinner_pressed.9.png
rename : mobile/android/base/resources/drawable/start.png => mobile/android/base/resources/drawable-mdpi/start.png
rename : mobile/android/base/resources/drawable/tab_close.png => mobile/android/base/resources/drawable-mdpi/tab_close.png
rename : mobile/android/base/resources/drawable/tab_indicator_divider.9.png => mobile/android/base/resources/drawable-mdpi/tab_indicator_divider.9.png
rename : mobile/android/base/resources/drawable/tab_indicator_selected.9.png => mobile/android/base/resources/drawable-mdpi/tab_indicator_selected.9.png
rename : mobile/android/base/resources/drawable/tab_indicator_selected_focused.9.png => mobile/android/base/resources/drawable-mdpi/tab_indicator_selected_focused.9.png
rename : mobile/android/base/resources/drawable/tab_new.png => mobile/android/base/resources/drawable-mdpi/tab_new.png
rename : mobile/android/base/resources/drawable/tab_new_pb.png => mobile/android/base/resources/drawable-mdpi/tab_new_pb.png
rename : mobile/android/base/resources/drawable/tab_thumbnail_default.png => mobile/android/base/resources/drawable-mdpi/tab_thumbnail_default.png
rename : mobile/android/base/resources/drawable/tab_thumbnail_shadow.png => mobile/android/base/resources/drawable-mdpi/tab_thumbnail_shadow.png
rename : mobile/android/base/resources/drawable/tabs_carat.png => mobile/android/base/resources/drawable-mdpi/tabs_carat.png
rename : mobile/android/base/resources/drawable/tabs_normal.png => mobile/android/base/resources/drawable-mdpi/tabs_normal.png
rename : mobile/android/base/resources/drawable/tabs_private.png => mobile/android/base/resources/drawable-mdpi/tabs_private.png
rename : mobile/android/base/resources/drawable/tabs_synced.png => mobile/android/base/resources/drawable-mdpi/tabs_synced.png
rename : mobile/android/base/resources/drawable/urlbar_stop.png => mobile/android/base/resources/drawable-mdpi/urlbar_stop.png
rename : mobile/android/base/resources/drawable/validation_arrow.png => mobile/android/base/resources/drawable-mdpi/validation_arrow.png
rename : mobile/android/base/resources/drawable/validation_arrow_inverted.png => mobile/android/base/resources/drawable-mdpi/validation_arrow_inverted.png
rename : mobile/android/base/resources/drawable/validation_bg.9.png => mobile/android/base/resources/drawable-mdpi/validation_bg.9.png
2013-01-23 17:07:45 -08:00
Fabrice Desré
00d6ff4c53 Bug 752982 - Part 1, implement captive portal detection service. r=thinker,dolske rs=dolske a=shira. 2012-09-15 11:37:53 +08:00
Margaret Leibovic
734478fa07 Bug 836450 - Add default bookmark support for distributions. r=mfinkle,wesj 2013-02-14 15:35:39 -08:00
Margaret Leibovic
8a458b0f57 Bug 836450 - Add getPackageName method to ContextProviderMockContext. r=gbrown 2013-02-14 15:35:36 -08:00
Sriram Ramasubramanian
62314e2b86 Bug 831021: Tab button shouldn't overlap with browser-toolbar. [r=mfinkle]
--HG--
extra : rebase_source : 998f9e9ad22fbe010a2fee1cab83fd5ef93c91c3
2013-02-14 14:34:09 -08:00
Sriram Ramasubramanian
21cdcc4e56 Bug 837113: Close button in tabs ui. [r=mfinkle]
--HG--
extra : rebase_source : 52af4d8e0316be67838fcd5a463a5fdcbac124c2
2013-02-14 13:23:15 -08:00