Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/0c310791efd7
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #14594 from evelynhung/issue-943317-v1.2

Bug 943317 - add a timer for expiring disableTap

========

https://hg.mozilla.org/integration/gaia-1_2/rev/a74d57288434
Author: Evelyn Hung <jj.evelyn@gmail.com>
Desc: Bug 943317 - add a timer for expiring disableTap
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/4eb29d5a57de
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #13955 from fcampo/exported-label-translate-929552

Bug 936889 - Followup for bug 929552 - Sync string for exported contacts (r=pike)(cherry picked from commit 10e5cd63155a41927b9fa3b5a2bd0726ed85f1ab)

Conflicts:
	apps/communications/contacts/locales/contacts.en-US.properties
Bug 916763 - Disable browser_bug896181_css_mixed_completion_new_attribute.js for too many intermittent failures. a=test-only
Bug 947570 - Rewrite browser_597071.js to fix intermittent timeouts. r=smacleod, a=test-only
Bug 840098 - Add mochitest. r=bzbarsky, a=test-only
Bug 945948 - Part 1: Use a Map to associate cursors with message managers. r=reuben, a=koi+
Bug 945948 - Part 2: Test contacts shutdown of cursors. r=reuben, a=koi+
Bug 927560 - Shutdown osfile_async_worker.js when it's not needed. r=froydnj, a=koi+
Bug 927560 - Shutdown osfile_async_worker.js, companion tests. r=froydnj, a=koi+
Bug 944859 - osfile_async_worker.js worker is never shut down in the parent process. r=yoric, a=koi+
Backed out changeset 66fd5784afd9 (bug 927560)
* * *
Bug 927560 - Shutdown osfile_async_worker.js, companion tests;r=froydnj
* * *
try: -b o -p emulator,emulator-jb,unagi -u xpcshell -t none
Bug 927560 - Skip test_shutdown.js on all platforms. r=Yoric, a=test-only
Backed out changeset fffc9cffa51f (bug 947570) for mochitest-bc bustage. a=test-only
Bug 901278 - More intelligently detect installed Xcode; r=mshal
Bug 917526 - Various duplicate symbol errors building tree with the 10.9 SDK. r=glandium, a=NPOTB
Bug 884014 - Can't build QuartzSupport with 10.9 SDK. r=bgirard, a=NPOTB
Bug 920804 - Improve nsFrameMessageManager p=fabrice,smaug, r=smaug,fabrice a=koi+
Bug 933070, MessageManager should use nsTObserverArray, r=fabrice a=koi+
Bug 822425 - Expose a few simple compartment assertions in jsfriendapi. r=mccr8

Only the first one will benefit from our Nightly-mode compartment assertions,
but both are useful for consistency.
Bug 911864 - Frob the marquee in a different fashion. r=me