From 11115ffec760b8db990adf5d78ebc44a80c55379 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 20 Mar 2015 02:45:27 -0700 Subject: [PATCH] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e5cd6f6ff1a5 Author: autolander Desc: Bug 1143636 - merge pull request #28941 from mnjul:bug_1143636_wordlistconverter_variable_freq to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/ea0cc625c704 Author: John Lu [:mnjul] Desc: Bug 1143636 - Allow word_list_converter.js to accpet variable word frequency information - WordListConverter constructor accepts array of words, or array of {w: word, f: freq} objects --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4611ee9fd89..c162d446dcd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3e3989820c47e611b81e4ed9a6d4b5a6912bf8db", + "git_revision": "dddd567dbe2ab3a355e3091eda3c04d3d00509d8", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "9637789b987cf0534e0828e8fc61ae5b189b08a2", + "revision": "e5cd6f6ff1a53624d8015476f5a7430206d67d44", "repo_path": "integration/gaia-central" }