Bug 935628 - Animate toolbar with translation instead of scroll (r=sriram)
Bug 935628 - Remove BrowserToolbarBackground from toolbar (r=sriram)
Bug 935628 - Only show right edge in toolbar when necessary (r=sriram)
Bug 936519 - Move general-purpose views to the widget package (r=mfinkle)

--HG--
rename : mobile/android/base/AllCapsTextView.java => mobile/android/base/widget/AllCapsTextView.java
rename : mobile/android/base/AnimatedHeightLayout.java => mobile/android/base/widget/AnimatedHeightLayout.java
rename : mobile/android/base/CheckableLinearLayout.java => mobile/android/base/widget/CheckableLinearLayout.java
rename : mobile/android/base/ClickableWhenDisabledEditText.java => mobile/android/base/widget/ClickableWhenDisabledEditText.java
rename : mobile/android/base/FlowLayout.java => mobile/android/base/widget/FlowLayout.java
Bug 936522 - Move preference-related to the preferences package (r=liuche)

--HG--
rename : mobile/android/base/AlignRightLinkPreference.java => mobile/android/base/preferences/AlignRightLinkPreference.java
rename : mobile/android/base/AndroidImport.java => mobile/android/base/preferences/AndroidImport.java
rename : mobile/android/base/AndroidImportPreference.java => mobile/android/base/preferences/AndroidImportPreference.java
rename : mobile/android/base/FontSizePreference.java => mobile/android/base/preferences/FontSizePreference.java
rename : mobile/android/base/GeckoPreferenceFragment.java => mobile/android/base/preferences/GeckoPreferenceFragment.java
rename : mobile/android/base/GeckoPreferences.java => mobile/android/base/preferences/GeckoPreferences.java
rename : mobile/android/base/LinkPreference.java => mobile/android/base/preferences/LinkPreference.java
rename : mobile/android/base/MultiChoicePreference.java => mobile/android/base/preferences/MultiChoicePreference.java
rename : mobile/android/base/PrivateDataPreference.java => mobile/android/base/preferences/PrivateDataPreference.java
rename : mobile/android/base/SyncPreference.java => mobile/android/base/preferences/SyncPreference.java
Bug 934900 - Ensure back/forward are not re-enabled while in editing mode (r=sriram)
Bug 935836 - should ensure button is operational when it's not, r=mconley
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ed6e6bf16fcf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #13049 from igordsm/bug-796702

Bug 796702 - Makes the current day from Day or Week views selected in the Month view. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/80f52e8c6cd9
Author: Igor Montagner <igordsm@gmail.com>
Desc: Solves bug 796702. Makes the current day from Day or Week views selected in the Month view.

Added unit test.
Backed out changesets 5fdcf5a9697f, da1a4740a722, and f16921967806 (bug 935628) for robocop failures.
CLOSED TREE
Merge inbound to m-c
Merge fx-team to m-c
Merge b2g-inbound to m-c
Merge m-c to inbound