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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/1adf38244854
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14392 from huchengtw-moz/gallery/Bug_946327_two_activity_handling

Bug 946327 - [B2G][SMS][MMS] Tapping multiple times rapidly on a sent or..., r=djf
(cherry picked from commit 38bddda919bcfa87abb1017a0c5484bdf7d0351c)

========

https://hg.mozilla.org/integration/gaia-1_2/rev/00014264ed43
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #14517 from dmarcos/bug948143

Bug 948143 - [gallery] Replace giant icons with reasonably sized one
(cherry picked from commit 329d2e6d2cf73ffe20a21c365a2015de54e7b83d)

========

https://hg.mozilla.org/integration/gaia-1_2/rev/3e37db2a7220
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #14391 from huchengtw-moz/gallery/Bug_945355-2

Bug 945355 - [B2G][Gallery] Viewing picture recieved in email or MMS sho..., r=djf
(cherry picked from commit 445cbc90e986d0d47194216eabd89a24f4a0f671)

========

https://hg.mozilla.org/integration/gaia-1_2/rev/1a7a809a322f
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Merge pull request #13853 from bgirard/HomescreenBorder

Bug 939392 - Remove invisible border for better performance. r=crdlc
(cherry picked from commit 019275e2e193ce7e9b5ac5f362af93ac0773722a)

========

https://hg.mozilla.org/integration/gaia-1_2/rev/f3bac65e2083
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #12286 from EragonJ/bug-914317

Bug 914317 - Add a check to remove title in prompts, r=@alivedise
(cherry picked from commit fb4fd23a83ca439d317238e8cba0d72d13990d44)
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
Merge b2g26 to v1.2f. a=merge