author Gaia Pushbot <release+gaiajson@mozilla.com>
Mon, 20 Jan 2014 01:21:02 -0800
changeset 175887 efe19b2b2de7660ff926c3868aeffdbf73a0f994
parent 159436 45097bc3a57898f22a4f3b74f8f8cf7511f5d0a4
permissions -rw-r--r--
Bumping gaia.json for 1 gaia-1_3 revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-1_3/rev/0cdba2aa2f39 Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com> Desc: Merge pull request #15117 from jaoo/945150 Bug 945150 - [DSDS] SIM manager(when PIN locked or no SIM), Call Settings, Message Settings and Cellular & Data are still accessible when airplane mode is on. r=arthurcc(cherry picked from commit cc28d9cf5214cbefb67171551ce2c367f7f80a7f) Conflicts: apps/settings/js/connectivity.js

# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

xpcom_FILES := xpcom-config.h
xpcom_DEST = $(DIST)/include
xpcom_TARGET := export