gecko/b2g
B2G Bumper Bot 2f0a6de56c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c7b6effecf4
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #20175 from davidflanagan/bug995540-master

Merge pull request #19409 from dmarcos/bug995540 r=dmarcos

========

https://hg.mozilla.org/integration/gaia-central/rev/4787cfb14cd1
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #19409 from dmarcos/bug995540

Bug 995540 - [Sora][camera]video recording would not stop instantly when...(cherry picked from commit 93623f6435849cc9f54d9996e8e64828ac9091d1)

Conflicts:

	apps/camera/js/app.js
	apps/camera/js/controllers/camera.js
	apps/system/js/attention_screen.js
2014-06-06 21:55:36 -07:00
..
app Bug 987718 - Part 6: Hooks up SelectionCaret; r=roc 2014-06-04 22:58:00 +02:00
branding
chrome Backed out changeset e0da2d69cfdb (bug 1020257) for causing Gi Test Regressions 2014-06-06 11:06:27 +02:00
components Bug 1019572 - Manually stop the media stream in test_permission_gum_remember.html. r=baku. 2014-06-05 05:07:00 -07:00
config Bumping gaia.json for 2 gaia revision(s) a=gaia-bump 2014-06-06 21:55:36 -07:00
dev Bug 1015949 - Land missing b2g/dev/app/moz.build file. r=mshal 2014-05-30 13:13:00 -04:00
gaia
installer Bug 987718 - Part 6: Hooks up SelectionCaret; r=roc 2014-06-04 22:58:00 +02:00
locales Bug 943268 - Remove nsCharsetAlias and nsCharsetConverterManager. r=emk. 2014-05-08 12:32:00 +03:00
simulator
test
app.mozbuild
build.mk
confvars.sh Bug 941796 - Enable exact rooting by default on b2g, r=nbp 2014-06-02 09:41:09 -07:00
LICENSE
Makefile.in
moz.build