merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Added info about why Wi-Fi is required

Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.

Bug: 7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
Fix layout with no access points

The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.

Bug: 7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924
Manually enter translations for msgid: 9014073093293520112

Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.

Bug: 7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d

Conflicts:

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-be/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
Remove blank translation string from en-GB, so it can show English.

Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ic248a0dc1baadcebad816f4870655a826fa7a5d7
am ab3472f5: Supporting EXTRA_APPWIDGET_OPTIONS correctly

* commit 'ab3472f5946c5dc3193c29513e31be7309ece378':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
Reconcile with jb-mr1-release - do not merge

Change-Id: Ibf539c16a9086609d5baf494ea5156c8967d02a5
am 4119788b: Add widget previews to the key guard widget picker

* commit '4119788b1be5d9b51e3c5cfe4e32f2aacc5a2f8f':
  Add widget previews to the key guard widget picker
am 5c5eff45: Pass argument to lock screen to show widget after adding it

* commit '5c5eff45e97a2bb1b55befb87eb535a438a7bbf8':
  Pass argument to lock screen to show widget after adding it
am c0fb8a39: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit 'c0fb8a399be0b3e4b365682c681ff24264bbef14':
  Updated assets.
am a487bca4: Updated layouts for keyguard widget picker

* commit 'a487bca4700a9dbd5d5d72913d0265ae86815edf':
  Updated layouts for keyguard widget picker
am f5336fd1: Allowing rotation while adding lockscreen widgets

* commit 'f5336fd114e557fce06197041aab70217308fe90':
  Allowing rotation while adding lockscreen widgets
am 9d41995b: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '9d41995bd1f158b852b6a12d73390535690b8b7e':
  Import translations. DO NOT MERGE
Reconcile with jb-mr1-release - do not merge

Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43
am 7d6a0f9c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '7d6a0f9c8b9494e3b735ea98836ff3b826e11c8e':
  Import translations. DO NOT MERGE