packages_apps_Settings.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Import translations. DO NOT MERGE	Baligh Uddin	2014-09-30	88	-537/+785
\| \| \| \| \|	Change-Id: Id1d79b0917bd6e59425a959a3038fd05e1490c18 Auto-generated-cl: translation import
*	am 24d0b6cc: am b496606d: am e5e43084: am 8ea6cbf7: am 9de68440: Merge ↵	Alexandra Gherghina	2014-09-29	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	"Match parent width for user spinner to fix tint" into lmp-dev * commit '24d0b6cc625313676e391fc3f61fc46f7b95e06d': Match parent width for user spinner to fix tint
\| *	am b496606d: am e5e43084: am 8ea6cbf7: am 9de68440: Merge "Match parent ↵	Alexandra Gherghina	2014-09-26	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	width for user spinner to fix tint" into lmp-dev * commit 'b496606ddcd1d43b8791b6bbd8399cf5c13c8b7a': Match parent width for user spinner to fix tint
\| \| *	am 9de68440: Merge "Match parent width for user spinner to fix tint" into ↵	Alexandra Gherghina	2014-09-26	1	-1/+1
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	lmp-dev * commit '9de68440a9ae9cfadee3939c1ca461e42871f766': Match parent width for user spinner to fix tint
\| \| \| *	Match parent width for user spinner to fix tint	Alexandra Gherghina	2014-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 17640172 Change-Id: I4cbea855cac9180d193f9ba936ec1bab81df537d
* \| \| \|	Merge "Separate wifi AP added by applications."	Vinit Deshpande	2014-09-27	1	-0/+4
\|\ \ \ \
\| * \| \| \|	Separate wifi AP added by applications.	Sky Faber	2014-09-27	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Add permission to allow settings to modify all wifi APs -Add option to show AP owners. Change-Id: I12943563ef714c4287e13488578f020d136d006d
* \| \| \| \|	am f1f7af01: am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix ↵	Alan Viverette	2014-09-24	5	-34/+14
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	background colors to point directly to theme attribute" into lmp-dev * commit 'f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72': Fix background colors to point directly to theme attribute
\| * \| \| \|	am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background ↵	Alan Viverette	2014-09-24	5	-34/+14
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	colors to point directly to theme attribute" into lmp-dev * commit '05df9029e951816888b06599dd7320de9362f038': Fix background colors to point directly to theme attribute
\| \| * \| \|	am 3156e38f: Merge "Fix background colors to point directly to theme ↵	Alan Viverette	2014-09-24	5	-34/+14
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attribute" into lmp-dev * commit '3156e38f5ec788048439a401ea5f5012e11ea2a7': Fix background colors to point directly to theme attribute
\| \| \| * \|	Fix background colors to point directly to theme attribute	Alan Viverette	2014-09-23	5	-34/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BUG: 17520824 Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
* \| \| \| \|	am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: ↵	John Spurlock	2014-09-23	2	-4/+14
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| / \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Wire up new zen events config option. * commit '2c383942b3fbda90e390cf8975fd3de32a0c007e': Settings: Wire up new zen events config option.
\| * \| \|	am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new ↵	John Spurlock	2014-09-23	2	-4/+14
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zen events config option. * commit 'a7fb5fbc7b35ba905d84362582bdf67d53ad5d40': Settings: Wire up new zen events config option.
\| \| * \|	am 7e905488: Settings: Wire up new zen events config option.	John Spurlock	2014-09-22	2	-4/+14
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '7e90548836b3e7c4ec8132d9965ba11f055f6931': Settings: Wire up new zen events config option.
\| \| \| *	Settings: Wire up new zen events config option.	John Spurlock	2014-09-22	2	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new switch to zen mode settings for the new events config attribute. Depends on frameworks/base: Iff10df385206ad73c3423ff118c79e94a10918d9 Bug:17580878 Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
\| \| \| *	Import translations. DO NOT MERGE	Baligh Uddin	2014-09-20	110	-354/+632
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I628b5768f52d634b8ce2a08b1fee5f07de7a8b68 Auto-generated-cl: translation import
\| \| \| *	Merge "Import translations. DO NOT MERGE" into lmp-dev	Baligh Uddin	2014-09-19	73	-1074/+266
\| \| \| \|\
\| \| \| \| *	Import translations. DO NOT MERGE	Baligh Uddin	2014-09-16	73	-1074/+266
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Iac811e557bb7b8e9910ff7e9cdcdefad13c99f8a Auto-generated-cl: translation import
\| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-09-20	84	-290/+501
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: Ic065056673757eb2cc68d1102d5e480418e7cc47 Auto-generated-cl: translation import
\| \| * \| \|	Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev	Baligh Uddin	2014-09-19	63	-2122/+1265
\| \| \|\ \ \
\| \| \| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-09-16	63	-2122/+1265
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I74adcddc2559efb083c46667f51b7849dd0cf952 Auto-generated-cl: translation import
\| * \| \| \| \|	am 21afc838: am 50a53bdb: am f6526146: am 0f01eeff: Merge "Removed an ↵	PauloftheWest	2014-09-18	2	-1/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	extraneous messge when pairing." into lmp-dev * commit '21afc838de9cf6cc495ccba36dcbc7c014b06220': Removed an extraneous messge when pairing.
\| \| * \ \ \ \	am f6526146: am 0f01eeff: Merge "Removed an extraneous messge when pairing." ↵	PauloftheWest	2014-09-18	2	-1/+3
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lmp-dev * commit 'f6526146250ff68df0f8941fe0b91ae74d55ab8d': Removed an extraneous messge when pairing.
\| \| \| * \| \| \|	am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev	PauloftheWest	2014-09-18	2	-1/+3
\| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb': Removed an extraneous messge when pairing.
\| * \| \| \| \| \|	am b340d01e: am 9d690250: am 66718d5a: am 894af268: logd: settings: ↵	Mark Salyzyn	2014-09-17	1	-0/+7
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ro.config.low_ram support * commit 'b340d01e2cd9564e61c73aa410a794055a46348b': logd: settings: ro.config.low_ram support
\| \| * \| \| \| \|	am 66718d5a: am 894af268: logd: settings: ro.config.low_ram support	Mark Salyzyn	2014-09-17	1	-0/+7
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '66718d5a6e51d58a83b186bdd2cc1b6665d0020c': logd: settings: ro.config.low_ram support
\| \| \| * \| \| \|	am 894af268: logd: settings: ro.config.low_ram support	Mark Salyzyn	2014-09-17	1	-0/+7
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '894af268def8a817306ea83f21cb25b6f0edf2e3': logd: settings: ro.config.low_ram support
\| * \| \| \ \ \ \	am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for ↵	PauloftheWest	2014-09-17	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	translation. * commit 'ed9fd0ddeda4a3be5f60745af99b8a80460afcae': Increase char limit for translation.
\| \| * \| \| \| \| \|	am b2737bc0: am 3cc81aea: Increase char limit for translation.	PauloftheWest	2014-09-17	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'b2737bc028cdfc72e81b45b149dc8adde639b6ac': Increase char limit for translation.
\| \| \| * \| \| \| \|	am 3cc81aea: Increase char limit for translation.	PauloftheWest	2014-09-17	1	-1/+1
\| \| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '3cc81aeabfca7eeb40a10e2ee70b6619494ecfcb': Increase char limit for translation.
\| * \| \| \| \| \| \|	am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates ↵	PauloftheWest	2014-09-17	1	-3/+7
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for Wi-Fi Settings dialog." into lmp-dev * commit '2aed3a5ef7c63a29102b405681e0ae15337097d0': Alignment updates for Wi-Fi Settings dialog.
\| \| * \| \| \| \| \|	am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings ↵	PauloftheWest	2014-09-16	1	-3/+7
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dialog." into lmp-dev * commit '9e7073aeb9c5ba03fe6d4f4a46a07a20eefad887': Alignment updates for Wi-Fi Settings dialog.
\| \| \| * \| \| \| \|	am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev	PauloftheWest	2014-09-16	1	-3/+7
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'ec21e62a78d98dfb22faeb8bd27ac07061ae83a3': Alignment updates for Wi-Fi Settings dialog.
\| * \| \| \ \ \ \ \	am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show ↵	Edward Jee	2014-09-17	3	-0/+25
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev * commit '69010fb13af1de42e17e78772c5f85bb1fa28374': Do not show phonebook access permission dialog if pairing dialog has already been shown.
\| \| * \| \| \| \| \| \|	am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission ↵	Edward Jee	2014-09-16	3	-0/+25
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dialog if pairing dialog has already been shown." into lmp-dev * commit '299faadbfc73f62ed0e8be968d62a42daf203e87': Do not show phonebook access permission dialog if pairing dialog has already been shown.
\| \| \| * \| \| \| \| \|	am b0954c1d: Merge "Do not show phonebook access permission dialog if ↵	Edward Jee	2014-09-16	3	-0/+25
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pairing dialog has already been shown." into lmp-dev * commit 'b0954c1d1e02958fd357cae11613f4539fbe270a': Do not show phonebook access permission dialog if pairing dialog has already been shown.
\| * \| \| \ \ \ \ \ \	am 3724edb3: am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all ↵	PauloftheWest	2014-09-17	3	-29/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	references to "Google Wi-Fi Assistant" from Settings." into lmp-dev * commit '3724edb357230c226f1c2b21c5795a97281022f3': Removed all references to "Google Wi-Fi Assistant" from Settings.
\| \| * \| \| \| \| \| \| \|	am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi ↵	PauloftheWest	2014-09-16	3	-29/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assistant" from Settings." into lmp-dev * commit '99f7d73b4722b196ba66d9e70741db0ced53b3c9': Removed all references to "Google Wi-Fi Assistant" from Settings.
\| \| \| * \| \| \| \| \| \|	am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from ↵	PauloftheWest	2014-09-16	3	-29/+1
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Settings." into lmp-dev * commit '0ca0c8ad20e5c630c62bc83e53b8d552a35a3e90': Removed all references to "Google Wi-Fi Assistant" from Settings.
\| * \| \| \ \ \ \ \ \ \	am 9bfbf642: am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app ↵	Maurice Lam	2014-09-17	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	starting window * commit '9bfbf6426bff4c7b8b074f0701dbf539b6c34b51': [WifiSetup] Disable app starting window
\| \| * \| \| \| \| \| \| \| \|	am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window	Maurice Lam	2014-09-16	1	-0/+6
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '95b283aabd26a757bc80abf6beff36346d15b20b': [WifiSetup] Disable app starting window
\| \| \| * \| \| \| \| \| \| \|	am 795511ec: [WifiSetup] Disable app starting window	Maurice Lam	2014-09-16	1	-0/+6
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '795511ec9c952041afb158d43dd22960443b503f': [WifiSetup] Disable app starting window
\| * \| \| \ \ \ \ \ \ \ \	am 9de624d8: am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi ↵	PauloftheWest	2014-09-16	59	-3/+70
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Settings icons to new filled-in teal format." into lmp-dev * commit '9de624d837513b4650f973d609006b03140f5507': Updated Wi-Fi Settings icons to new filled-in teal format.
\| \| * \| \| \| \| \| \| \| \| \|	am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new ↵	PauloftheWest	2014-09-15	59	-3/+70
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filled-in teal format." into lmp-dev * commit 'dc985292be99c6330ec26a912a5d025f0986158a': Updated Wi-Fi Settings icons to new filled-in teal format.
\| \| \| * \| \| \| \| \| \| \| \|	am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal ↵	PauloftheWest	2014-09-15	59	-3/+70
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	format." into lmp-dev * commit '13fbd848d4d39e81bb79231f1d6f63722a7b36f6': Updated Wi-Fi Settings icons to new filled-in teal format.
\| \| * \| \ \ \ \ \ \ \ \ \	am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user ↵	Alexandra Gherghina	2014-09-12	16	-264/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	icons" into lmp-dev * commit '69af2c6adc6adea77254c4709ac0c7d1ae9e8d00': Switch to using system-wide default user icons
\| \| \| * \| \| \| \| \| \| \| \| \|	am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev	Alexandra Gherghina	2014-09-12	16	-264/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6': Switch to using system-wide default user icons
\| \| * \| \ \ \ \ \ \ \ \ \ \	am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev	Svetoslav	2014-09-12	2	-0/+38
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '842e9d04ade970409f930686d875644e3d827e19': Fix print icons in settings.
\| \| \| * \| \| \| \| \| \| \| \| \| \|	am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev	Svetoslav	2014-09-11	2	-0/+38
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e': Fix print icons in settings.
\| \| * \| \ \ \ \ \ \ \ \ \ \ \	am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix ↵	PauloftheWest	2014-09-12	1	-0/+49
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build breakage. * commit '23d0ac449119cb30de08d03fb38f92e87c9009ed': Added bluetooth_device_settings_header to fix build breakage.