Strings for activity_about.xml added
activity_about.xml made more consistent
Merge pull request #654 from anishgkanchan/issue-622

Make about page more consistent #622
Merge pull request #659 from garvankeeley/provider-to-client

Provider to client-side only for Fennec Integration
updated sdk license
Merge pull request #661 from garvankeeley/newlic

updated sdk license for travis
Add Arcticbus on-bus wifi to blocklist
Merge pull request #662 from haaninjo/master

Add Arcticbus on-bus wifi to blocklist (@haaninjo)
Add OnniBus.com on-bus wifi to blocklist
Added ScrollView to the activity_about.xml
Merge pull request #665 from kallelampila/master

Add OnniBus.com on-bus wifi to blocklist (@kallelampila)
Prevent crash

While not using the stumbler, a dialog would still pop up saying that the stumbler
had crashed:

E/AndroidRuntime(25424): Caused by: java.lang.NullPointerException
E/AndroidRuntime(25424):        at org.mozilla.mozstumbler.service.StumblerService.onStartCommand(StumblerService.java:138)
E/AndroidRuntime(25424):        at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:2729)
E/AndroidRuntime(25424):        ... 10 more

This is annoying to users, so should be stopped.
Merge pull request #673 from keverets/stop-crash

Prevent crash
Remove check for a specfic intent, any start intent is acceptable, and
these might change as we add more
Merge pull request #674 from garvankeeley/remove-intent-check

Passive Stumbler: Remove check for a specific start intent
Bug 1024708 - Pre: Add MPLv2 license headers to code that ships with Fennec.
Merge pull request #675 from ncalexan/nalexander/license-headers

Bug 1024708 - Pre: Add MPLv2 license headers to code that ships with Fennec.
Update SSIDBlockList.java
Update SSIDBlockList.java
Merge pull request #666 from JiMMaR/master

Added ScrollView to the activity_about.xml #621