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

========

https://hg.mozilla.org/integration/gaia-central/rev/46e5403b509a
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #16063 from davidflanagan/bug942199

Bug 942199: Allow minimum EXIF preview size to be configured at build ti...

========

https://hg.mozilla.org/integration/gaia-central/rev/c266b6e2ea0d
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
(cherry picked from commit e439f8630fdea790595efaebab24ec21be6bc0e4)

Conflicts:

	apps/camera/js/filmstrip.js
This commit is contained in:
B2G Bumper Bot 2014-02-07 17:05:10 -08:00
Родитель af7d844d1f
Коммит 211197a6c8
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -1,4 +1,4 @@
{
"revision": "2651e0d87f95bbf027a3f96a505b0777df4134a0",
"revision": "46e5403b509a78f27f4e1866adb860dc2eaf8f40",
"repo_path": "/integration/gaia-central"
}