Bug 946674 - Building emulator on darwin x86 leads to failure make: *** No rule to make target `out/host/darwin-x86/usr', needed by `"out/emulator.tar.gz"'. Stop.
Merge pull request #138 from petemoore/master

Bug 946674 - Building emulator on darwin x86 leads to failure make: *** ...
Bug 946247 - add getToken and overloading start/finish Operation to support KK. r=mwu
Merge pull request #139 from Seinlin/Bug-946247

Bug 946247 - add getToken and overloading start/finish Operation for KK ...
Bug 935059 - Add partial and full FOTA targets

Adds two targets: gecko-update-fota and gecko-update-fota-full. The
later will produce a classical FOTA update of the whole /system
partition while the first one will provide a configurable scope-limited
update: by default, only /system/b2g. This directory can be altered by
setting the B2G_FOTA_DIRS environment variable, e.g. running:
$ B2G_FOTA_DIRS="system/b2g system/fonts" ./build.sh gecko-update-fota
Will produce a FOTA package only containing system/fonts and system/b2g.
No need to patch init.rc on JB and newer platforms. r=mwu
Merge pull request #140 from Seinlin/Bug-953009

No need to patch init.rc on JB and newer platforms. r=mwu
Merge pull request #137 from lissyx/bug935059

Bug 935059 - Add partial and full FOTA targets r=marshall
Bug 939372 - Remove shell version of oom-logger. r=dhylands
Merge pull request #141 from dhylands/remove-oom-logger

Bug 939372 - Remove shell version of oom-logger. r=dhylands
Bug 964196: Give nfcd access to wake locks

This patch changes the group of the nfcd process to 'system', so
that nfcd has access to the wake-lock interface in /sys/power/.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug 945630 - Expose a device-depent preference file for loading device specific preference settings. r=mwu
Bug 962932 - Implement GonkSched
Merge pull request #146 from msliu/master

Bug 945630 - Expose a device-depent preference file for loading device s...
Merge pull request #147 from michaelwu/gonksched

Bug 962932 - Implement GonkSched
Merge pull request #144 from tdz/bug-964196

Bug 964196: Give nfcd access to wake locks
Bug 969088 - Include per-process/thread seccomp state in b2g-ps output. r=dhylands
Merge pull request #150 from jld/bug969088-b2g-ps-seccomp

Bug 969088 - Include per-process/thread seccomp state in b2g-ps output.
Bug 969090 - Make b2g-ps read process/thread name from /proc/<pid>/status.

This is helpful on the ICS emulator, which uses an old kernel version
where /proc/<pid>/comm doesn't exist.
Merge pull request #151 from jld/bug969090-b2g-ps-status-name

Bug 969090 - Make b2g-ps read process/thread name from /proc/<pid>/status. r=dhylands