Ryan VanderMeulen
7442d9d745
Merge inbound to m-c. a=merge
2014-10-16 14:43:13 -04:00
Carsten "Tomcat" Book
82495ab4f5
Merge m-c to b2g-inbound
2014-10-16 16:16:53 +02:00
Carsten "Tomcat" Book
c3f8f98b4e
merge mozilla-inbound to mozilla-central a=merge
2014-10-16 16:07:06 +02:00
B2G Bumper Bot
f60a142ed0
Bumping manifests a=b2g-bump
2014-10-16 06:49:05 -07:00
B2G Bumper Bot
b6e8dc94f3
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/63436aa17e7f
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #25097 from julienw/1082064-prevent-double-domcontentloaded
Bug 1082064 - [Messages] Prevent double DOMContentLoaded events r=schung
========
https://hg.mozilla.org/integration/gaia-central/rev/b9c9bc4a82c1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1082064 - [Messages] Prevent double DOMContentLoaded events r=schung
2014-10-16 06:48:51 -07:00
Dave Hylands
9328e0faa5
Bug 1072625 - Cleanup debug in AdbController. r=fabrice
2014-10-15 19:44:22 -07:00
B2G Bumper Bot
e27748db34
Bumping manifests a=b2g-bump
2014-10-15 16:31:57 -07:00
B2G Bumper Bot
4d97bdf0e8
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8017299c3eb7
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #24964 from jimporter/ringtone-now-playing
Bug 1029198 - [ringtones] Ringtone Manager should visually indicate whic...
========
https://hg.mozilla.org/integration/gaia-central/rev/da637ea64860
Author: Jim <jporter@mozilla.com>
Desc: Bug 1029198 - [ringtones] Ringtone Manager should visually indicate which ringtone is being previewed; r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/d3099e7bdad8
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #11500 from jimporter/music-id3-improvements
Bug 841949 - Improve id3 parsing in the music app
========
https://hg.mozilla.org/integration/gaia-central/rev/7dc0fe90905e
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 841949 - [music] Improve ID3 parsing
2014-10-15 16:25:47 -07:00
B2G Bumper Bot
2449804f47
Bumping manifests a=b2g-bump
2014-10-15 15:11:57 -07:00
B2G Bumper Bot
a8574c1aae
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/69664277989a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25194 from KevinGrandon/bug_1083500_dialer_card_state_log
Bug 1083500 - Log a message when we can't make a call because of cardState
========
https://hg.mozilla.org/integration/gaia-central/rev/ff94c17eb483
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1083500 - Log a message when we can't make a call because of cardState r=drs
2014-10-15 15:05:48 -07:00
B2G Bumper Bot
3bf2357c13
Bumping manifests a=b2g-bump
2014-10-15 14:41:57 -07:00
B2G Bumper Bot
6344c711e9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3cbf43cfdbca
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #25166 from dmarcos/bug1082116
Bug 1082116 - [Camera] Face detection does not work after touch focus
========
https://hg.mozilla.org/integration/gaia-central/rev/c56c24b1fb4b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 1082116 - [Camera] Face detection does not work after touch focus
2014-10-15 14:35:48 -07:00
B2G Bumper Bot
af923ad98b
Bumping manifests a=b2g-bump
2014-10-15 14:11:57 -07:00
B2G Bumper Bot
81f39089ab
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d82754b6fc1c
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #24942 from yzen/bug-1069197
Bug 1069197 - added screen reader support for the calendar for the month...
========
https://hg.mozilla.org/integration/gaia-central/rev/38907948a073
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1069197 - added screen reader support for the calendar for the month view. r=millermedeiros
========
https://hg.mozilla.org/integration/gaia-central/rev/874521b9997f
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #25171 from pivanov/bug-1081657
Bug 1081657 - key.wav and special.wav does not sound different
========
https://hg.mozilla.org/integration/gaia-central/rev/02c94f1f8b77
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1081657 - key.wav and special.wav does not sound different
2014-10-15 14:05:46 -07:00
Ryan VanderMeulen
15cb58e24e
Merge m-c to b2g-inbound. a=merge
...
CLOSED TREE
2014-10-15 15:58:42 -04:00
B2G Bumper Bot
6caf7d2a51
Bumping manifests a=b2g-bump
2014-10-15 12:06:57 -07:00
B2G Bumper Bot
6c4c52d690
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3bbb2a959ee6
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #25130 from albertopq/1082457-add-int-tests-statusbar
Bug 1082457 - Adding integration tests to statusbar r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/b76c42fc1946
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1082457 - Adding integration tests to statusbar
2014-10-15 12:00:48 -07:00
Ryan VanderMeulen
b87718267b
Merge inbound to m-c. a=merge
...
CLOSED TREE
2014-10-15 14:31:16 -04:00
B2G Bumper Bot
78edfab1b8
Bumping manifests a=b2g-bump
2014-10-15 11:17:02 -07:00
Mike Taylor
70b6965d0a
Bug 1083536 - Remove max-width/height on radio & checkbox inputs. r=bz
2014-10-15 20:16:00 +02:00
B2G Bumper Bot
3e94e16af6
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f0b97cd11eeb
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25010 from KevinGrandon/bug_995687_mock_dump_insertion
Bug 995687 - Move DUMP overwriting to suiteSetup and suiteTeardown
========
https://hg.mozilla.org/integration/gaia-central/rev/0957cd965522
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 995687 - Move DUMP overwriting to suiteSetup and suiteTeardown r=julienw
2014-10-15 11:10:48 -07:00
B2G Bumper Bot
ed711613f2
Bumping manifests a=b2g-bump
2014-10-15 10:27:35 -07:00
B2G Bumper Bot
0e90ef3099
Bumping gaia.json for 19 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2bb6c21bc7ce
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #25156 from cctuan/1082741
Bug 1082741 - [FxA] Unable to progress past Age Verification page when creating a new FxA
========
https://hg.mozilla.org/integration/gaia-central/rev/f69e2f931967
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1082741 - [FxA] Unable to progress past Age Verification page when creating a new FxA
========
https://hg.mozilla.org/integration/gaia-central/rev/22018459a835
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #25185 from Cwiiis/bug1061466-system-update-splash
Bug 1061466 - Show a splash screen when doing a system update. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/0331b7b6e706
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1061466 - Add a basic marionette test for update splash-screen. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/9a83175a4982
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1061466 - Show a splash screen when doing a system update. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/925e16095739
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #24838 from Cwiiis/bug1078295-sms-menu-transitions
Bug 1078295 - Add transitions to menus in SMS. r=steveck
========
https://hg.mozilla.org/integration/gaia-central/rev/8e893d90bcc9
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1078295 - Add transitions to menus in SMS and dialer. r=steveck,drs
========
https://hg.mozilla.org/integration/gaia-central/rev/8e07ec289272
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #25121 from wilsonpage/1082465
Bug 1082465 - [cost-control] Theme not applied to settings view
========
https://hg.mozilla.org/integration/gaia-central/rev/a8eda287e824
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1082465 - [cost-control] Theme not applied to settings view
========
https://hg.mozilla.org/integration/gaia-central/rev/51523182359e
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #24701 from pivanov/bug-1071542
Bug 1071542 - [Search] Blurry Settings Icon & incorrect alignment and sizing of string
========
https://hg.mozilla.org/integration/gaia-central/rev/297ce2d19e3f
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1071542 - [Search] Blurry Settings Icon & incorrect alignment and sizing of string
========
https://hg.mozilla.org/integration/gaia-central/rev/f5651c4ad361
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25103 from KevinGrandon/bug_1081764_collection_edit_saving
Bug 1081764 - [Collection] Save collection on enter press
========
https://hg.mozilla.org/integration/gaia-central/rev/dc4f662e0a1f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1081764 - [Collection] Save collection on enter press r=crdlc
========
https://hg.mozilla.org/integration/gaia-central/rev/b56d2d8e9740
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25102 from KevinGrandon/bug_1081764_bookmarks_edit
Bug 1081764 - [Bookmark] Save bookmark on enter press
========
https://hg.mozilla.org/integration/gaia-central/rev/c152f2fcd4f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1081764 - [Bookmark] Save bookmark on enter press r=crdlc
========
https://hg.mozilla.org/integration/gaia-central/rev/41e77361d21d
Author: Guillaume C. Marty <gmarty@users.noreply.github.com>
Desc: Merge pull request #25143 from gmarty/Bug-1061969-fix
Bug 1082650 - Utility tray must consider software home button
========
https://hg.mozilla.org/integration/gaia-central/rev/277bd05d17ed
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1082650 - Utility tray must consider software home button
========
https://hg.mozilla.org/integration/gaia-central/rev/be767bffc7c4
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1061466 - Show a splash screen when doing a system update. r=alive" for gaia unit test failures
This reverts commit 8088d3e61251ed6d0a1a4f1153a7967cfc9ddef5.
========
https://hg.mozilla.org/integration/gaia-central/rev/13b314c2b6f8
Author: BavarianTomcat <tomcat@mozilla.com>
Desc: Revert "Bug 1061466 - Add a basic marionette test for update splash-screen. r=alive" for gaia unit test failure
This reverts commit b4787087c0fe2c906361acd201b31674c00e04a1.
2014-10-15 10:25:49 -07:00
B2G Bumper Bot
dd67832284
Bumping manifests a=b2g-bump
2014-10-15 07:01:59 -07:00
B2G Bumper Bot
9e3840191e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e718ab2615a4
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #25099 from cctuan/1081860
Bug 1081860 - [NFC][KK] Wording on shrinking UI truncate when keyboard shows up
========
https://hg.mozilla.org/integration/gaia-central/rev/602f967a75f2
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1081860 - [NFC][KK] Wording on shrinking UI truncate when keyboard shows up
2014-10-15 06:55:48 -07:00
B2G Bumper Bot
98c1074490
Bumping manifests a=b2g-bump
2014-10-15 05:01:54 -07:00
B2G Bumper Bot
bc08bda741
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a220240dbe41
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Merge pull request #25123 from Cwiiis/bug1061466-system-update-splash
Bug 1061466 - Show a splash screen when doing a system update. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/bb315afca127
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1061466 - Add a basic marionette test for update splash-screen. r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/91969023d725
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1061466 - Show a splash screen when doing a system update. r=alive
2014-10-15 04:55:46 -07:00
B2G Bumper Bot
53ab0760a0
Bumping manifests a=b2g-bump
2014-10-15 02:47:13 -07:00
B2G Bumper Bot
7f7b01d69c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/210585c28131
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #24826 from chirarobert/update_ftu
Bug 1065933 - Capture crash report for intermittent crash in test_ftu_wi...
========
https://hg.mozilla.org/integration/gaia-central/rev/402e744d67ed
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1065933 - Capture crash report for intermittent crash in test_ftu_with_tour
2014-10-15 02:40:53 -07:00
B2G Bumper Bot
e2dfbf73ce
Bumping manifests a=b2g-bump
2014-10-15 02:31:56 -07:00
B2G Bumper Bot
95c256bf4e
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dd725f000541
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #25022 from jmcanterafonseca/contacts_datastore.js
Bug 1081082 - [Contacts] [Data Refactor] Provide a convenient way for pr...
========
https://hg.mozilla.org/integration/gaia-central/rev/0bc45ede4966
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1081082 - [Contacts] [Data Refactor] Provide a convenient way for providers to get access to their 'contacts' datasore
========
https://hg.mozilla.org/integration/gaia-central/rev/7d5fdd9b817b
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #25023 from viorelaioia/bug_1080557
Bug 1080557 - Update test_browser_bookmark.py to delete the bookmark add...
========
https://hg.mozilla.org/integration/gaia-central/rev/7f9d7e7c91e0
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1080557 - Update test_browser_bookmark.py to delete the bookmark added
2014-10-15 02:25:48 -07:00
B2G Bumper Bot
6509c98538
Bumping manifests a=b2g-bump
2014-10-15 02:17:05 -07:00
B2G Bumper Bot
8ed1447354
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0acae4a0f69d
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #25056 from sudheesh001/Patch_1077771
Bug 1077771 - Fixes jshint errors in apps/bluetooth/js/deviceList.js. r=iliu
========
https://hg.mozilla.org/integration/gaia-central/rev/12cff01d9da6
Author: sudheesh001 <sudheesh1995@outlook.com>
Desc: Bug 1077771 Fixes jshint errors in apps/bluetooth/js/deviceList.js r=ianliu
========
https://hg.mozilla.org/integration/gaia-central/rev/913de66dfb0f
Author: Zac <zcampbell@mozilla.com>
Desc: Revert "Revert "Bug 1079211 - [v2.2] Disable test_unlock_to_camera_with_passcode because of Bug 1078270""
This reverts commit 4f86c631e0465c0e56ccebeb1324fd28be9ea32f.
2014-10-15 02:10:48 -07:00
B2G Bumper Bot
5ba259b8b8
Bumping manifests a=b2g-bump
2014-10-15 01:31:57 -07:00
B2G Bumper Bot
e2f8bb9318
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2ae29d0cf3ca
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #24882 from pivanov/bug-1069525
Bug 1069525 - (Settings) Network > Data Dialogs are using the wrong styles.
========
https://hg.mozilla.org/integration/gaia-central/rev/0aee3805dd34
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1069525 - (Settings) Network > Data Dialogs are using the wrong styles.
2014-10-15 01:25:47 -07:00
B2G Bumper Bot
0d50fde0e0
Bumping manifests a=b2g-bump
2014-10-16 06:31:56 -07:00
B2G Bumper Bot
9173012939
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a7514117d102
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24878 from chuck-lee/bug-1010127_Support_not_in_range_in_AP_list
Bug 1010127 - Show configred but no signal AP as 'Not in range'. r=ejchen
========
https://hg.mozilla.org/integration/gaia-central/rev/f9ab61143037
Author: Chuck Lee <chulee@mozilla.com>
Desc: Bug 1010127 - Show configred but no signal AP as 'Not in range'. r=ejchen
2014-10-16 06:25:47 -07:00
B2G Bumper Bot
d402160f6a
Bumping manifests a=b2g-bump
2014-10-16 04:02:29 -07:00
B2G Bumper Bot
f6553be3ef
Bumping manifests a=b2g-bump
2014-10-16 03:19:38 -07:00
B2G Bumper Bot
021ed6cd68
Bumping manifests a=b2g-bump
2014-10-14 21:11:56 -07:00
B2G Bumper Bot
85cde209ce
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cbff74c74ea4
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #25048 from timdream/screen-brightness-transition
Bug 1081426 - Move screen brightness transition control out of ScreenManager, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/655ea98b8322
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1081426 - Move screen brightness transition control out of ScreenManager
2014-10-14 21:05:47 -07:00
B2G Bumper Bot
4d47e79ee4
Bumping manifests a=b2g-bump
2014-10-14 20:36:55 -07:00
B2G Bumper Bot
9c74a120cf
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/602ee2a680a0
Author: Doug Sherk <github@sherk.me>
Desc: Revert "Bug 1077331 - Only seek ringtone back to start on ringtone if the file is loaded fully enough to seek. r=etienne"
This reverts commit 815211451d4352ecd4bdda4ae1bad1e0f3f9f2cc.
2014-10-14 20:30:46 -07:00
B2G Bumper Bot
94ad6ca074
Bumping manifests a=b2g-bump
2014-10-14 19:22:02 -07:00
B2G Bumper Bot
8aa445510a
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0a1a85dfff02
Author: Sherman Chen <shamenchens@users.noreply.github.com>
Desc: Merge pull request #24803 from shamenchens/Bug1078114-SupportTVApps
Bug 1078114 - Support tv_apps directory for CardUI related apps, r=RickyChien
========
https://hg.mozilla.org/integration/gaia-central/rev/7ef34ce5e0b0
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 1078114 - Support tv_apps directory for CardUI related apps
========
https://hg.mozilla.org/integration/gaia-central/rev/3b735a41b99d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25152 from eliperelman/bug-1061962-integration-test
Bug 1061962 - Adding integration test for SHB sleep menu patch
========
https://hg.mozilla.org/integration/gaia-central/rev/b5a3663b5557
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1061962 - Adding integration test for SHB sleep menu patch
2014-10-14 19:15:54 -07:00
B2G Bumper Bot
a6e231a51f
Bumping manifests a=b2g-bump
2014-10-14 17:52:02 -07:00
B2G Bumper Bot
27e454f8da
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8ad4396e8704
Author: Mitchell Van Der Hoeff <mitchell.vanderhoeff@gmail.com>
Desc: Bug 1069599 - Changed all gaia-subheaders in costcontrol to aria-level 2 with role="heading" r=salva
========
https://hg.mozilla.org/integration/gaia-central/rev/53febc770e86
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Changed all gaia-subheaders in costcontrol to aria-level 2 with role="heading""
This reverts commit a32ad3e1cb738dbe4d4643cbbe5c9f3e5ee9d808.
Revert for not having the proper bug number in the commit message, bug 1069599.
2014-10-14 17:45:52 -07:00
B2G Bumper Bot
57467e8755
Bumping manifests a=b2g-bump
2014-10-14 17:39:01 -07:00
B2G Bumper Bot
20210be8f5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3864ad3f145e
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1081808 - [LockScreen] Decouple the fake-notification styles r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/32dc7cfbb941
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "[LockScreen] Decouple the fake-notification styles"
This reverts commit 22c40f05db8f60927bae594ee6cac8e18b6e8c95.
Backout for not having the proper bug number, bug 1081808.
2014-10-14 17:38:47 -07:00
Wes Kocher
5b358466f8
Merge m-c to b2g-inbound a=merge
2014-10-14 17:36:36 -07:00