Commit Graph

353282 Commits

Author SHA1 Message Date
Terrence Cole
ffad9b311e Bug 987666 - Follow to remove a SkipRoot that leaked into the browser; r=bustage ON A CLOSED TREE 2014-03-28 12:01:50 -04:00
Nicolas Silva
216960b7a3 Bug 977255 - Backout for build bustage on a CLOSED TREE 2014-03-28 17:01:52 +01:00
B2G Bumper Bot
a2447750b8 Bumping manifests a=b2g-bump 2014-03-28 08:56:57 -07:00
B2G Bumper Bot
a52c1bf939 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c56ef2ae3159
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Revert "Bug 984800 - [MADAI][Contacts] @2.25x assets update for Contacts"

This reverts commit 7e1778e27c0af3add5cc6853b48aae045726ece1.
2014-03-28 08:55:45 -07:00
B2G Bumper Bot
e072f64d1e Bumping manifests a=b2g-bump 2014-03-28 08:46:11 -07:00
B2G Bumper Bot
86553fc16b Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bc78fbad02de
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 988519 - [Camera] Improve localization" for gaia-unit test failures

This reverts commit 5f3874235f25e0cfdcaf3af239f8238b34426461.
2014-03-28 08:40:59 -07:00
B2G Bumper Bot
55e1ba3dea Bumping manifests a=b2g-bump 2014-03-28 08:32:32 -07:00
Fredrik Lanker
6a7621165b Bug 985481 - [Camera][Gecko] Make sure that a supported video size is set. r=dhylands 2014-03-28 11:29:57 -04:00
Marco Castelluccio
ab04d11170 Bug 972927 - Re-enable dom/apps tests on b2g. r=RyanVM 2014-03-28 11:29:57 -04:00
B2G Bumper Bot
0befc4b9ad Bumping manifests a=b2g-bump 2014-03-28 08:11:09 -07:00
B2G Bumper Bot
0b565b5587 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8b749da3986f
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17755 from wilsonpage/bug/989295

Bug 989295 - [Camera] Fix SettingsController test breaking TBPL

========

https://hg.mozilla.org/integration/gaia-central/rev/d17d42feab93
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 989295 - [Camera] Fix SettingsController test breaking TBPL
2014-03-28 08:06:00 -07:00
Sotaro Ikeda
38a5cd3ffa Bug 983971 - Do not use gralloc for small size on ICS gonk r=nical 2014-03-28 07:35:21 -07:00
B2G Bumper Bot
e7eb21fc64 Bumping manifests a=b2g-bump 2014-03-28 07:31:11 -07:00
B2G Bumper Bot
daf033fb5b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/91070081da26
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17746 from arcturus/bug-984800

Bug 984800 - [MADAI][Contacts] @2.25x assets update for Contacts

========

https://hg.mozilla.org/integration/gaia-central/rev/246d5476cefd
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 984800 - [MADAI][Contacts] @2.25x assets update for Contacts
2014-03-28 07:26:10 -07:00
B2G Bumper Bot
d6d40b811e Bumping manifests a=b2g-bump 2014-03-28 06:36:09 -07:00
B2G Bumper Bot
28012af407 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/88562261eeee
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17744 from ian-liu/system2/bug964653_system_dialog_refactor"

This reverts commit 09fe38e11a1979567838bfbadb5122af61ae8dcf, reversing
changes made to e9442b73fd5c01c366457b9a4d52387453615f1e.

========

https://hg.mozilla.org/integration/gaia-central/rev/edee16b51277
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #17696 from jmcanterafonseca/fix_bday_date_2

Bug 988399 - [B2G][Contacts] Contacts birthday set to January first inco...

========

https://hg.mozilla.org/integration/gaia-central/rev/97bed6d76dc6
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 988399 - [B2G][Contacts] Contacts birthday set to January first incorrectly shows previous year
2014-03-28 06:31:00 -07:00
B2G Bumper Bot
f6a9869e1d Bumping manifests a=b2g-bump 2014-03-28 06:26:51 -07:00
B2G Bumper Bot
607d0f0e29 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d4a0023950c6
Author: AndreiH <andrei.hutusoru@softvision.ro>
Desc: Merge pull request #17596 from bebef1987/fix_set

Bug 986329 - Fix test_settings_XXX.py with JavascriptException:

========

https://hg.mozilla.org/integration/gaia-central/rev/d2dce9cd930f
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined

========

https://hg.mozilla.org/integration/gaia-central/rev/3d1670c17265
Author: Bebe <bebe@mozilla.ro>
Desc: Revert "Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined"

This reverts commit fab38c4384733c3eed51ceaec2787c7d5962dcd3.
2014-03-28 06:20:42 -07:00
B2G Bumper Bot
53ccb33e5a Bumping manifests a=b2g-bump 2014-03-28 04:11:02 -07:00
B2G Bumper Bot
e6d74b4e8a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/95a5e52e5e92
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #17751 from lightsofapollo/enable-branches

Update to new image and simplify commands as the result

========

https://hg.mozilla.org/integration/gaia-central/rev/147727011116
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 989274 - Update to new image and simplify commands as the result
2014-03-28 04:06:15 -07:00
B2G Bumper Bot
8bcd76d62f Bumping manifests a=b2g-bump 2014-03-28 04:01:09 -07:00
B2G Bumper Bot
31333a0c5f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d063205f3410
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17725 from wilsonpage/bug/972137

Bug 972137 - [Camera] 1.4 Visual Design Settings Menu

========

https://hg.mozilla.org/integration/gaia-central/rev/521925e3ccba
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 972137 - [Camera] 1.4 Visual Design Settings Menu
2014-03-28 03:56:07 -07:00
B2G Bumper Bot
14fac06591 Bumping manifests a=b2g-bump 2014-03-28 03:36:17 -07:00
B2G Bumper Bot
178dd70fe9 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c07999aef46f
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Merge pull request #17657 from fcampo/969525-sd-usb-export

Bug 969525 - Wrong message exporting contacts with USBStorage enabled (r=jmcf)

========

https://hg.mozilla.org/integration/gaia-central/rev/bfaab93724d2
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 969525 - Wrong message exporting contacts with USBStorage enabled

Fixed:
- Rewrite updateStorageOptions function for better readability
- Got rid of Settings dependency
- Tests added for export, fixed for import

========

https://hg.mozilla.org/integration/gaia-central/rev/567fbe750069
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17719 from wilsonpage/bug/985680

Bug 985680 - [Camera][Mozilla][UX] 1.4 Video record active button style not to spec

========

https://hg.mozilla.org/integration/gaia-central/rev/718416de75b5
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985680 - [Camera][Mozilla][UX] 1.4 Video record active button style not to spec

========

https://hg.mozilla.org/integration/gaia-central/rev/f9a01c994d9d
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17723 from wilsonpage/bug/988519

Bug 988519 - [Camera] Improve localization

========

https://hg.mozilla.org/integration/gaia-central/rev/7d2b657bff1b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988519 - [Camera] Improve localization
2014-03-28 03:31:06 -07:00
B2G Bumper Bot
34f3630338 Bumping manifests a=b2g-bump 2014-03-28 03:21:23 -07:00
B2G Bumper Bot
9dfe467e8f Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bdd7c6599dd8
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #16732 from samjoch/bug-975535-vsd-refresh-update-app-icons-in-homescreen-settings-app-permissions

Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App permissions [r=ranbena,crdlc]

========

https://hg.mozilla.org/integration/gaia-central/rev/4e53bd4a7793
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 975535 - E.me followups [r=ranbena]

========

https://hg.mozilla.org/integration/gaia-central/rev/1e3d98a27f59
Author: Sam Joch <samuel@guiora.com>
Desc: Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
2014-03-28 03:16:16 -07:00
B2G Bumper Bot
c41ff3de5b Bumping manifests a=b2g-bump 2014-03-28 03:06:11 -07:00
B2G Bumper Bot
dd8d6b0669 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a828864b5d77
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17627 from gitmai/bug-987283-CC-300ms-cold-load-launch

Bug 987283 -usage app cold_load_launch regressed 300ms Mar 22
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/320068047e90
Author: mai <mri@tid.es>
Desc: Bug 987283 -usage app cold_load_launch regressed 300ms Mar 22
2014-03-28 03:01:04 -07:00
B2G Bumper Bot
8cae4e2c1b Bumping manifests a=b2g-bump 2014-03-28 02:56:11 -07:00
B2G Bumper Bot
08344f71ac Bumping gaia.json for 9 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b4199210d025
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn"

This reverts commit b49429f4cacb8085d2bc420d83c094aeda404e88.

========

https://hg.mozilla.org/integration/gaia-central/rev/bfe353ceab6c
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #17736 from snowmantw/issue960915-emergencycall-as-app

Bug 960915 - (emergencycall-as-app) [LockScreen][EmergencyCall] Make EmergencyCall as an app

========

https://hg.mozilla.org/integration/gaia-central/rev/c6594812c57a
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 960915 - (emergencycall-as-app) [LockScreen][EmergencyCall] Make EmergencyCall as an app

========

https://hg.mozilla.org/integration/gaia-central/rev/e9252eabc9e3
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17726 from wilsonpage/bug/988441

Bug 988441 - [Camera][Madai][Mozilla][UX] 1.4 Image Preview text should ...

========

https://hg.mozilla.org/integration/gaia-central/rev/814a58f08aa7
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988441 - [Camera][Madai][Mozilla][UX] 1.4 Image Preview text should match confirmation text

========

https://hg.mozilla.org/integration/gaia-central/rev/5ca22fd42436
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17712 from wilsonpage/bug/988484

Bug 988484 - [Camera] HUD blinks on startup

========

https://hg.mozilla.org/integration/gaia-central/rev/7c7af40d809a
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 988484 - [Camera] HUD blinks on startup

========

https://hg.mozilla.org/integration/gaia-central/rev/f96347ce24b2
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #17744 from ian-liu/system2/bug964653_system_dialog_refactor

Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/889510dbdaea
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window
2014-03-28 02:51:01 -07:00
B2G Bumper Bot
2c8bec4ad1 Bumping manifests a=b2g-bump 2014-03-28 02:16:09 -07:00
B2G Bumper Bot
14be0930d8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a1a693a02e58
Author: gitmai <mri@tid.es>
Desc: Merge pull request #16815 from gitmai/bug-860718-CC-plot-line-jumps

Bug 860718 - Costcontrol plot line in graph jumps, small vertical gap be...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/dffb7aca14f4
Author: mai <mri@tid.es>
Desc: Bug 860718 - Costcontrol plot line in graph jumps, small vertical gap between consecutive parts
2014-03-28 02:10:55 -07:00
B2G Bumper Bot
31f8414528 Bumping manifests a=b2g-bump 2014-03-28 01:11:02 -07:00
B2G Bumper Bot
6eddba3ad9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ec26c0a5b504
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17738 from yurenju/stage-windows-squash-3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/74499fc25baa
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
2014-03-28 01:05:46 -07:00
B2G Bumper Bot
d5d7e6e019 Bumping manifests a=b2g-bump 2014-03-27 23:47:45 -07:00
B2G Bumper Bot
a9a0be8648 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/84dbd52b4ab1
Author: You-Sheng Yang <vicamo@gmail.com>
Desc: Merge pull request #17380 from vicamo/bugzilla/936703/call-screen-indexeddb-abort-error

Bugzilla/936703/call screen indexeddb abort error

========

https://hg.mozilla.org/integration/gaia-central/rev/8e5cbba30fed
Author: You-Sheng Yang <vicamo@gmail.com>
Desc: Bug 936703 - [async_storage] callback in transaction.oncomplete event. r=djf

CostControl app invokes |Common.closeApplication()| in its
asyncStorage operation callbacks.  However, these callbacks are
invoked in IDBRequest.onsuccess events when the corresponding
transaction is not necessarily completed.  That is, we may have
following sequence:

  1) IDBRequest.onsuccess
  2) call to Common.closeApplication()
  3) invalidate open IDBDatabase
  4) trying to invoke IDBTransaction.oncomplete results in an
     AbortError.

We should follow W3C's suggestion here -- listen
IDBTransaction.oncomplete instead of IDBRequest.onsuccess.

[1]: http://www.w3.org/TR/IndexedDB/#widl-IDBTransaction-oncomplete
2014-03-27 23:46:01 -07:00
B2G Bumper Bot
ac5ffd44a4 Bumping manifests a=b2g-bump 2014-03-27 23:26:04 -07:00
B2G Bumper Bot
5772da731b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ca3e3bc0a88f
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17737 from RudyLu/keyboard/Bug984328_master

Bug 984328 - [Keyboard][V1.3T] The alternative char menu cannot be
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/f065e0275a6e
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 984328 - [Keyboard][V1.3T] The alternative char menu cannot be
displayed
 - To set initial value of cached window height/width when the keyboard
   is relaunched after memory pressure.
2014-03-27 23:20:51 -07:00
B2G Bumper Bot
f704ed1d9b Bumping manifests a=b2g-bump 2014-03-27 20:57:32 -07:00
B2G Bumper Bot
262a7a2a2b Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d0f0289f0c27
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Reset Gaia master to state prior to horkage.

========

https://hg.mozilla.org/integration/gaia-central/rev/889cace84877
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #16553 from huchengtw-moz/system/Bug_971554_instantiable_soundmanager

Bug 971554 - [System2] Instantiable SoundManager, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/7c79b44ebb90
Author: John Hu <johu@mozilla.com>
Desc: Bug 971554 - [System2] Instantiable SoundManager
2014-03-27 20:55:51 -07:00
Ben Kelly
9594ac92bc Bug 982237: Add skia max size pref. Limit to screen size on b2g. r=snorp 2014-03-27 23:48:22 -04:00
B2G Bumper Bot
b1224a6d8a Bumping manifests a=b2g-bump 2014-03-27 20:46:09 -07:00
B2G Bumper Bot
1c5028633b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/64ce5f9516f3
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #16282 from ian-liu/system/bug964653_system_dialog_refactor

Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window, r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/766cdb825bd5
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window
2014-03-27 20:40:50 -07:00
Wes Kocher
662794ff4d Merge m-c to b2g-inbound 2014-03-27 20:22:58 -07:00
Wes Kocher
3948825ebe Merge fx-team to m-c 2014-03-27 20:07:56 -07:00
B2G Bumper Bot
7881bef18f Bumping manifests a=b2g-bump 2014-03-27 20:07:41 -07:00
B2G Bumper Bot
567dce7489 Bumping gaia.json for 11 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/901ff964c0db
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 2b64b43391a8a747b6381bdf072fd94265ae8909, reversing
changes made to 2a3ac3962b898f934e224741d839f5bc6d18c542.

========

https://hg.mozilla.org/integration/gaia-central/rev/9a6e161bc127
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 520aa82e0c5e0a1f90544a682e779bf9b8af1e93, reversing
changes made to 2b64b43391a8a747b6381bdf072fd94265ae8909.

========

https://hg.mozilla.org/integration/gaia-central/rev/4961d9d0e173
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit cb090fc1bc5d60c0e810dc33c3e0ef46ee678a23, reversing
changes made to 520aa82e0c5e0a1f90544a682e779bf9b8af1e93.

========

https://hg.mozilla.org/integration/gaia-central/rev/2acd5640214a
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 601118bc1f479d8f94ef4beb78c36b5a0bcdcf85, reversing
changes made to cb090fc1bc5d60c0e810dc33c3e0ef46ee678a23.

========

https://hg.mozilla.org/integration/gaia-central/rev/087c6c2dff85
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 11c85ad98bf9ba1f8d37f7e07a778b3c5b712198, reversing
changes made to 601118bc1f479d8f94ef4beb78c36b5a0bcdcf85.

========

https://hg.mozilla.org/integration/gaia-central/rev/516ffc023cef
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/c11e2e840352
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/f34065a0c1af
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/a51a62ccc66e
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/77b03d8c12fd
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia

========

https://hg.mozilla.org/integration/gaia-central/rev/76aea561b205
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17673 from marshall/ftuPing"

This reverts commit c3c12544f7acbf0e66d7d481c0718634e068d3ce, reversing
changes made to d84935863b56ea76d7d33486f44a64467a70885f.
2014-03-27 20:05:43 -07:00
Wes Kocher
3d817ab8e1 Merge b2g-inbound to m-c 2014-03-27 19:37:17 -07:00
B2G Bumper Bot
8818c7b7b6 Bumping manifests a=b2g-bump 2014-03-27 19:32:18 -07:00
B2G Bumper Bot
fcfb243d0e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/533dc7862c89
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17685 from alivedise/bugzilla/963003/attention-screen-on-soft-home

Bug 963003 - Fix attention screen height on software home button shown, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/c3cbe34b1ac3
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 963003 - Fix attention screen height on software home button shown
2014-03-27 19:25:26 -07:00