Bug 825142 - Removed the apache-http, jhead and libphonenumber packages
Merge pull request #46 from gabrielesvelto/bug-825142

Bug 825142 - Removed the apache-http, jhead and libphonenumber packages
Bug 811671 - Pull apriori, elfcopy and elfutils to enable prelinking.

Change-Id: I793c999973ec6635d587034302ed4c7b2031d3d2
Merge pull request #47 from ting-yuan/prelink

Bug 811671 - Pull apriori, elfcopy and elfutils to enable prelinking. r=jlebar
Bug 822225: Switch bionic to linaro/ics-plus-aosp on PandaBoard

The new bionic branch contains changes that are already present on
other B2G devices; including a fix for bug 809367, where memory was
allocated after a new process was forked but before exec got called.

Change-Id: Icd56961a3fac455a51192a1ced3db9e9ef330744
Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Merge pull request #51 from tdz/bug-822225

Bug 822225: Switch bionic to linaro/ics-plus-aosp on PandaBoard
Use upstream hardware/qcom/display on hamachi
fix revision attribute for bionic project r=mwu
bug 841593 - pandaboard still needs jhead r=gsvelto
bug 716859 - pull emulator from mozilla-b2g/android-development
change emulator revision to remote branch, use git.mozilla.org
Merge branch 'master' of https://github.com/mozilla-b2g/b2g-manifest into default

Conflicts:
	emulator.xml

Change-Id: Ib75910de0260aca81f97e4939eeca758961d27cf