frameworks_base.git - frameworks/base

	Commit message (Collapse)	Author	Age	Files	Lines
*	Partially revert "Merge tag 'android-6.0.1_r22' of ↵	Michael Bestas	2016-05-04	2	-0/+137
\| \| \| \| \| \| \| \| \|	https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
*	Revert "SettingsLib: Add back accidentally removed translations"	Michael Bestas	2016-05-02	2	-137/+0
\| \| \| \| \| \|	This reverts commit 2c35c469fa343b499b55dddc37cd77d4ac0e26c5. Change-Id: I47daa01ed8f5a26ff5326750e6c55ff3bc4b93b3
*	SettingsLib: Add back accidentally removed translations	Michael Bestas	2016-04-15	2	-0/+137
\| \| \| \| \| \|	* These were removed in r22 merge Change-Id: I1e0b4e910b8a9a86733be4b66516a003115a6c45
*	Automatic translation import	Michael Bestas	2016-03-18	1	-0/+27
	Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4