Commit Graph

9398 Commits

Author SHA1 Message Date
B2G Bumper Bot
081c8b7771 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/00ac3e1c36d9
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #18838 from julienw/980496-gaia-test-profile

Bug 980496 - Change the default profile folder used in bin/gaia-test and...

========

https://hg.mozilla.org/integration/gaia-central/rev/7b89b9684305
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 980496 - Change the default profile folder used in bin/gaia-test and leverage PROFILE_FOLDER r=bkelly r=yurenju
2014-05-06 07:20:42 -07:00
B2G Bumper Bot
6cbe1e3d51 Bumping manifests a=b2g-bump 2014-05-06 07:11:28 -07:00
B2G Bumper Bot
0d88f5eb62 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c7fbad82fc68
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #18985 from frsela/STK/Bug1004298

Bug 1004298 - STK PLAY_TONE fails when text is added to the proactive command

========

https://hg.mozilla.org/integration/gaia-central/rev/dc89a13e9a3a
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: Bug 1004298 - STK PLAY_TONE fails when text is added to the proactive command
2014-05-06 07:05:33 -07:00
B2G Bumper Bot
df0bc16b18 Bumping manifests a=b2g-bump 2014-05-06 06:28:02 -07:00
B2G Bumper Bot
e451f10b8e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/677a789e57dc
Author: gitmai <mri@tid.es>
Desc: Merge pull request #18982 from gitmai/bug-1006404-css-done-button

Bug 1006404 -[Cost control] Done button css rules

========

https://hg.mozilla.org/integration/gaia-central/rev/32cdf0b0afc8
Author: mai <mri@tid.es>
Desc: Bug 1006404 -[Cost control] Done button css rules

========

https://hg.mozilla.org/integration/gaia-central/rev/c9a895254933
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18955 from svic/Bug_1006032

Bug 1006032 - Choose better identifiers for l10n resources

========

https://hg.mozilla.org/integration/gaia-central/rev/0b69f05e1355
Author: Arno Puder <arno@puder.org>
Desc: Bug 1006032 - Choose better identifiers for l10n resources. r=alive
2014-05-06 06:26:02 -07:00
B2G Bumper Bot
13e1944181 Bumping manifests a=b2g-bump 2014-05-06 05:50:03 -07:00
B2G Bumper Bot
7e5bc31858 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/01196f8bc535
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #18972 from gtorodelvalle/rnown-call-log-bug-991062

Bug 991062 - Call log: Take out filters while in edit mode

========

https://hg.mozilla.org/integration/gaia-central/rev/eab10e2d47db
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 991062 - Call log: Take out filters while in edit mode
2014-05-06 05:49:52 -07:00
B2G Bumper Bot
9d5f28c763 Bumping manifests a=b2g-bump 2014-05-06 05:11:14 -07:00
B2G Bumper Bot
e66bea9624 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6e22b74b2659
Author: gitmai <mri@tid.es>
Desc: Merge pull request #18979 from gitmai/bug-1006348-app-mantain-previous-view

Bug 1006348 -[Cost control] After minimizing the app with the settings s...

========

https://hg.mozilla.org/integration/gaia-central/rev/70a74ecaec07
Author: mai <mri@tid.es>
Desc: Bug 1006348 -[Cost control] After minimizing the app with the settings screen opened, this view is closed when the app is relaunched
2014-05-06 05:05:48 -07:00
B2G Bumper Bot
14a7f716c0 Bumping manifests a=b2g-bump 2014-05-06 04:16:32 -07:00
B2G Bumper Bot
ccad92e70c Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2dc4aa7b0899
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #18975 from AndreiH/bug_1000863

Xfail Bug 1000863 - Investigate test_fmradio_find_stations.py failure

========

https://hg.mozilla.org/integration/gaia-central/rev/11a723d89bb2
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Xfail Bug 1000863 - Investigate test_fmradio_find_stations.py failure

========

https://hg.mozilla.org/integration/gaia-central/rev/03ee0b0e5609
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #18951 from etiennesegonzac/bug-1005648-isBackground-sheets

Bug 1005648 - Apps launched by system message don't have screenshots r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/153b45d34d5a
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1005648 - Apps launched by system message don't have screenshots when swiping from the edge.
2014-05-06 04:11:04 -07:00
B2G Bumper Bot
b95abf65a4 Bumping manifests a=b2g-bump 2014-05-06 04:01:26 -07:00
B2G Bumper Bot
578485d01d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4b76954b7eeb
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #18969 from AndreiH/bug_1005923

Bug 1005923 - test_fmradio_frequency_dialer.TestFMRadioFreqDialer is not...

========

https://hg.mozilla.org/integration/gaia-central/rev/6c458ddee16f
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 1005923 - test_fmradio_frequency_dialer.TestFMRadioFreqDialer is not flicking
2014-05-06 03:55:42 -07:00
B2G Bumper Bot
080f97a47e Bumping manifests a=b2g-bump 2014-05-06 02:51:27 -07:00
B2G Bumper Bot
c0241469fa Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/633328133e6d
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #18787 from zacc/bug_990214

Bug 990214 - Remove clearing of /data/local/webapps from cleanup_data to...

========

https://hg.mozilla.org/integration/gaia-central/rev/6306a3b5dc5f
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 990214 - Remove clearing of /data/local/webapps from cleanup_data to unblock runs on Inari

========

https://hg.mozilla.org/integration/gaia-central/rev/023857d88305
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #18950 from crdlc/bug-1005939

Bug 1005939 - Border radius is displayed before images are loaded in merge list

========

https://hg.mozilla.org/integration/gaia-central/rev/6a1d16c34ddf
Author: crdlc <crdlc@tid.es>
Desc: Bug 1005939 - Border radius is displayed before images are loaded in merge list

========

https://hg.mozilla.org/integration/gaia-central/rev/683a93909506
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #18949 from crdlc/bug-1005954

Bug 1005954 - Images are not loaded in merge list

========

https://hg.mozilla.org/integration/gaia-central/rev/6eb1b9e99054
Author: crdlc <crdlc@tid.es>
Desc: Bug 1005954 - Images are not loaded in merge list
2014-05-06 02:45:59 -07:00
B2G Bumper Bot
dc1117d1ec Bumping manifests a=b2g-bump 2014-05-06 02:08:05 -07:00
B2G Bumper Bot
03cdd46932 Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/16395cc21812
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #18945 from crdlc/bug-1005340

Bug 1005340 - [Home2] Offline Icon Handling

========

https://hg.mozilla.org/integration/gaia-central/rev/4a1952552833
Author: crdlc <crdlc@tid.es>
Desc: Bug 1005340 - [Home2] Offline Icon Handling

========

https://hg.mozilla.org/integration/gaia-central/rev/30eebc375f8b
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18316 from gasolin/issue-968696

Bug 968696 - [settings] add marionette test for Media storage panel, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/c80a241cf3f8
Author: gasolin <gasolin@gmail.com>
Desc: Bug 968696 - [settings] add marionette test for Media storage panel

========

https://hg.mozilla.org/integration/gaia-central/rev/cc73373e4bfd
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #18966 from timdream/two-homescreen

Bug 996514 - Don't homescreenWindow.render() twice, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/09d5a55dfe2f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 996514 - Don't homescreenWindow.render() twice

========

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

Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is brok...

========

https://hg.mozilla.org/integration/gaia-central/rev/bf90c9d39196
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is broken

========

https://hg.mozilla.org/integration/gaia-central/rev/22901490caab
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Merge pull request #18931 from tauzen/Bug1004218

Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/2d01b36d25e4
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager
2014-05-06 02:06:20 -07:00
B2G Bumper Bot
06d25b6f49 Bumping manifests a=b2g-bump 2014-05-05 22:51:30 -07:00
B2G Bumper Bot
97b354a8e7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/962718c0f5aa
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18924 from gasolin/issue-1003736

Bug 1003736 - [Settings] Two column not right displayed, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/f1be2a2a8772
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1003736 - [Settings] Two column not right displayed
2014-05-05 22:46:11 -07:00
B2G Bumper Bot
f282d23fa6 Bumping manifests a=b2g-bump 2014-05-05 21:56:21 -07:00
B2G Bumper Bot
ddfeb3dbf1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f8b30821692f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18963 from KevinGrandon/bug_1006236_whitelist_phone_production_apps

Bug 1006236 - Whitelist phone production apps

========

https://hg.mozilla.org/integration/gaia-central/rev/0f3ead637607
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1006236 - Whitelist phone production apps r=yuren
2014-05-05 21:50:53 -07:00
Wes Kocher
51b4f13fac Merge m-c to b2g-inbound 2014-05-05 21:19:59 -07:00
Wes Kocher
ad07adf5a3 Merge b2g-inbound to m-c 2014-05-05 21:07:22 -07:00
B2G Bumper Bot
29577b2a22 Bumping manifests a=b2g-bump 2014-05-05 18:51:33 -07:00
B2G Bumper Bot
b963e82710 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/62115b0e70ad
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo"

This reverts commit 09411b0bc84f9e5e30e410b1fbb2612872a0f55e.
2014-05-05 18:46:16 -07:00
B2G Bumper Bot
fbf08c0647 Bumping manifests a=b2g-bump 2014-05-05 17:01:22 -07:00
B2G Bumper Bot
cc0340d1df Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8d2303ecf807
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #13303 from KevinGrandon/bug_841422_test_app_for_shared_tests

Bug 841422 - Move unit tests for shared code out of gallery

========

https://hg.mozilla.org/integration/gaia-central/rev/f633dde17d98
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo
2014-05-05 16:55:57 -07:00
B2G Bumper Bot
fbdf4530b5 Bumping manifests a=b2g-bump 2014-05-05 13:41:11 -07:00
B2G Bumper Bot
1f7dfce68c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d390f67c5661
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18507 from svic/Bug_970148

Bug 970148 - Support for simple pairing record

========

https://hg.mozilla.org/integration/gaia-central/rev/5dbd7c2ddd33
Author: Arno Puder <arno@puder.org>
Desc: Bug 970148 - Support for simple pairing record. r=alive
2014-05-05 13:35:42 -07:00
B2G Bumper Bot
ef6f43113e Bumping manifests a=b2g-bump 2014-05-05 11:51:25 -07:00
B2G Bumper Bot
346438ccfd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a068e204670a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18911 from KevinGrandon/bug_1005330_shared_downloads_jshint

Bug 1005330 - JSHint fixes for shared/js/download/ r=aus

========

https://hg.mozilla.org/integration/gaia-central/rev/3fe3d7de0380
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005330 - JSHint fixes for shared/js/download/ r=aus
2014-05-05 11:46:00 -07:00
B2G Bumper Bot
f93f08fb09 Bumping manifests a=b2g-bump 2014-05-05 11:36:21 -07:00
B2G Bumper Bot
a0787d36f2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5db104074da
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18900 from tauzen/Bug1000981

Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/0b9cd698f317
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file
2014-05-05 11:30:56 -07:00
Mason Chang
93aa3561dc Bug 980027 - Part 3: Add compositor priority prefs to b2g.js. r=gsvelto 2014-05-05 11:38:00 -04:00
J. Ryan Stinnett
a9449bad20 Bug 1001348 - Keep system sources when certified debugging is allowed. r=vingtetun 2014-04-30 10:58:00 -04:00
Alexandre Poirot
4712c71b0f Bug 1000122 - Override browser.startup.homepage in Mulet as a complex value. r=vingtetun 2014-05-05 07:46:00 -04:00
B2G Bumper Bot
cfaca3954a Bumping manifests a=b2g-bump 2014-05-05 10:16:27 -07:00
B2G Bumper Bot
e24c324bf3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e262f052f525
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #18870 from nullaus/bug1004239

bug 1004239 -- Filter out all titles that contain app:// protocol and re...

========

https://hg.mozilla.org/integration/gaia-central/rev/d2bcb22abf39
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 1004239 -- Filter out all titles that contain app:// protocol and replace with application name or empty string.
2014-05-05 10:11:00 -07:00
B2G Bumper Bot
2715edd796 Bumping manifests a=b2g-bump 2014-05-05 09:11:35 -07:00
B2G Bumper Bot
ffee17ad73 Bumping gaia.json for 9 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/510e78b15db6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18706 from KevinGrandon/bug_1001625_haida_build_flag

Bug 1001625 - Create a unified build flag to enable all haida features and preferences

========

https://hg.mozilla.org/integration/gaia-central/rev/78b2972e1c1b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1001625 - Create a unified build flag to enable all haida features and preferences r=yuren

========

https://hg.mozilla.org/integration/gaia-central/rev/907b3aa2a97d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18916 from KevinGrandon/bug_997005_shared_bookmarks_database_context

Bug 997005 - BookmarksDatabase does not properly bind context to handleEvent

========

https://hg.mozilla.org/integration/gaia-central/rev/1cf06d441c67
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 997005 - BookmarksDatabase does not properly bind context to handleEvent r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/cb113ea627f6
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #18927 from rnowm/1005802"

This reverts commit 7cceb7de02a72b8ffecbb0844caf5cac17e0b66b, reversing
changes made to 1e42ad6f307f69ad269dd5baba935cd7fc82b703.

========

https://hg.mozilla.org/integration/gaia-central/rev/cff3df8143fe
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18917 from KevinGrandon/bug_1005715_home2_missing_animation_frames

Bug 1005715 - [Home2] Missing frames during pinch-to-zoom

========

https://hg.mozilla.org/integration/gaia-central/rev/7b6dc7838c59
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005715 - [Home2] Missing frames during pinch-to-zoom r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/f004d5b85fa2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #18881 from crdlc/bug-1004929

Bug 1004929 - Follow up bug 1003752 - Gaia integration test failures on TBPL r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/d6e495b9fc44
Author: crdlc <crdlc@tid.es>
Desc: Bug 1004929 - Follow up bug 1003752 - Gaia integration test failures on TBPL
2014-05-05 09:05:41 -07:00
B2G Bumper Bot
3354ecc454 Bumping manifests a=b2g-bump 2014-05-05 08:31:18 -07:00
B2G Bumper Bot
9c76e75524 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5424cbc2e534
Author: Julien Wajsberg <felash@gmail.com>
Desc: Revert "Merge pull request #18750 from jmcanterafonseca/oauth_facebook"

This reverts commit 800800b332d03580f4f8748e5046d71f00a3c7d9, reversing
changes made to 7b6b5a4ec6e45fc475105d6a288d77cbb2f17bc2.
2014-05-05 08:25:44 -07:00
B2G Bumper Bot
6ddbbdb803 Bumping manifests a=b2g-bump 2014-05-05 07:51:24 -07:00
B2G Bumper Bot
fdffec837b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1a4623a0b3d0
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #18765 from stasm/1002772-homescreen-ready

Bug 1002772 - Don't set document's lang and dir in Homescreen. r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/6c272830c570
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1002772 - Don't set document's lang and dir in Homescreen. r=vingtetun
2014-05-05 07:45:58 -07:00
Wes Kocher
94e82b3ed0 Backed out changeset 189a0e19896f (bug 1001348) for breaking the Gaia interface 2014-05-05 15:25:22 -07:00
Dave Hylands
cbc0a4b450 Bug 1001542 - Make OS_VERSION use b2g version info rather than Linux version info. 2014-05-05 15:24:58 -07:00
B2G Bumper Bot
4abbbcc317 Bumping manifests a=b2g-bump 2014-05-05 15:23:00 -07:00
B2G Bumper Bot
0e89050e77 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/99e60837965b
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #18795 from staktrace/killsettings

Merge pull request #18795 from staktrace/killsettings. r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/37a3326f4463
Author: Kartikaya Gupta <kgupta@mozilla.com>
Desc: Bug 1003228 - Remove redundant force-enabling of APZ in developer builds. r=janx

========

https://hg.mozilla.org/integration/gaia-central/rev/a0210ba68ce7
Author: Kartikaya Gupta <kgupta@mozilla.com>
Desc: Bug 1003228 - Remove the toggle button for APZ from the sleep menu. r=janx

========

https://hg.mozilla.org/integration/gaia-central/rev/2ec5b8166f5a
Author: Kartikaya Gupta <kgupta@mozilla.com>
Desc: Bug 1003228 - Remove some graphics options from the developer menu as they are not needed any more. r=janx
2014-05-05 15:21:02 -07:00
B2G Bumper Bot
bd936a051f Bumping manifests a=b2g-bump 2014-05-05 14:46:44 -07:00
B2G Bumper Bot
358e01b8e8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/19678f97e3e3
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #18864 from punamdahiya/Bug968061

Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu

========

https://hg.mozilla.org/integration/gaia-central/rev/79ae58d599d3
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug968061 - [NFC][Gallery][Video] - Prevent the NFC pairing for info view and confirm delete dialog r=johnhu
2014-05-05 14:40:37 -07:00