packages_apps_settings.git - packages/apps/settings

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 33f86196 to stage-aosp-master	Elliott Hughes	2012-09-06	51	-104/+1
\|\
\| *	Stop hard-coding sample 12- and 24-hour times.	Elliott Hughes	2012-09-06	51	-104/+1
* \|	am 38ce5194: Merge "Enable to delete a stored persistent group from p2p setti...	Jean-Baptiste Queru	2012-08-28	1	-0/+6
\|\ \ \| \|/
\| *	Merge "Enable to delete a stored persistent group from p2p settings."	Jean-Baptiste Queru	2012-08-28	1	-0/+6
\| \|\
\| \| *	Enable to delete a stored persistent group from p2p settings.	Yoshihiko Ikenaga	2012-08-28	1	-0/+6
* \| \|	am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card wh...	Jean-Baptiste Queru	2012-08-23	2	-0/+5
\|\ \ \ \| \|/ /
\| * \|	MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active	Li Gang	2012-08-10	2	-0/+5
\| \|/
* \|	am c5acc132: Import translations. DO NOT MERGE	Baligh Uddin	2012-08-14	4	-23/+23
\|\ \
\| * \|	Import translations. DO NOT MERGE	Baligh Uddin	2012-08-14	4	-23/+23
* \| \|	am 5d72b272: Merge "Add support for SE Android to the Settings app."	Jean-Baptiste Queru	2012-08-08	2	-0/+13
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add support for SE Android to the Settings app.	Stephen Smalley	2012-07-20	2	-0/+13
* \| \|	am 3eee86b8: Import translations. DO NOT MERGE	Ying Wang	2012-08-03	2	-6/+6
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-08-03	2	-6/+6
* \| \|	am d7ae05db: Import translations. DO NOT MERGE	Ying Wang	2012-08-01	4	-15/+15
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-08-01	4	-15/+15
* \| \|	am 723bdf1e: Import translations. DO NOT MERGE	Ying Wang	2012-07-30	12	-20/+20
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-30	12	-20/+20
* \| \|	am eaeb8b61: Import translations. DO NOT MERGE	Ying Wang	2012-07-27	2	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-27	2	-2/+2
* \| \|	am 07841668: Merge "Move Google-apps specific location settings to a Google p...	Amith Yamasani	2012-07-26	1	-5/+19
\|\ \ \ \| \|/ /
\| * \|	Merge "Move Google-apps specific location settings to a Google package" into ...	Amith Yamasani	2012-07-26	1	-5/+19
\| \|\ \
\| \| * \|	Move Google-apps specific location settings to a Google package	Amith Yamasani	2012-07-26	1	-5/+19
* \| \| \|	am 4e53a0cb: Import translations. DO NOT MERGE	Ying Wang	2012-07-26	3	-19/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-26	3	-19/+10
* \| \| \|	am c31f6b23: Import translations. DO NOT MERGE	Ying Wang	2012-07-25	33	-514/+259
\|\ \ \ \ \| \|/ / /
\| * \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-25	33	-514/+259
* \| \| \|	am 54199540: Import translations. DO NOT MERGE	Ying Wang	2012-07-24	49	-202/+666
\|\ \ \ \ \| \|/ / /
\| * \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-24	49	-202/+666
\| \|/ /
* \| \|	am 4635ec6b: Strings for upcoming location settings changes.	Amith Yamasani	2012-07-23	1	-5/+13
\|\ \ \ \| \|/ /
\| * \|	Strings for upcoming location settings changes.	Amith Yamasani	2012-07-23	1	-5/+13
* \| \|	am 13be5469: Import translations. DO NOT MERGE	Ying Wang	2012-07-23	5	-5/+5
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-23	5	-5/+5
* \| \|	am 509cfa1d: Import translations. DO NOT MERGE	Ying Wang	2012-07-20	5	-90/+90
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-20	5	-90/+90
* \| \|	am 35e404c8: Import translations. DO NOT MERGE	Ying Wang	2012-07-19	3	-10/+7
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-19	3	-10/+7
* \| \|	am 2bc05a27: Import translations. DO NOT MERGE	Ying Wang	2012-07-18	23	-139/+76
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-18	23	-139/+76
* \| \|	am fa0f3fe1: Import translations. DO NOT MERGE	Ying Wang	2012-07-17	39	-193/+98
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-17	39	-193/+98
* \| \|	am 66daca6b: Import translations. DO NOT MERGE	Ying Wang	2012-07-16	49	-86/+354
\|\ \ \ \| \|/ /
\| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-16	49	-86/+354
* \| \|	am ea819b07: Merge "Implement issue #6819955: Add button to take bug report."...	Dianne Hackborn	2012-07-13	2	-0/+15
\|\ \ \ \| \|/ /
\| * \|	Merge "Implement issue #6819955: Add button to take bug report." into jb-dev	Dianne Hackborn	2012-07-13	2	-0/+15
\| \|\ \
\| \| * \|	Implement issue #6819955: Add button to take bug report.	Dianne Hackborn	2012-07-13	2	-0/+15
* \| \| \|	am 4b25c5ad: Import translations. DO NOT MERGE	Ying Wang	2012-07-13	49	-180/+273
\|\ \ \ \ \| \|/ / /
\| * \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-13	49	-180/+273
\| \|/ /
* \| \|	am 62acae4f: Merge "Import translations. DO NOT MERGE" into jb-dev	Ying Wang	2012-07-12	1	-41/+41
\|\ \ \ \| \|/ /
\| * \|	Merge "Import translations. DO NOT MERGE" into jb-dev	Ying Wang	2012-07-12	1	-41/+41
\| \|\ \
\| \| * \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-12	1	-41/+41