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	1	-5/+4
\| \| \| \| \| \| \| \| \|	https://android.googlesource.com/platform/frameworks/base into cm-13.0" This reverts commit 0e1dbed9194839a90755670d8fdf9046a75b85f7, reversing changes made to 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8. Change-Id: Ife3a8c9c898034d5161fbf25a03eaf173ec66246
*	Import translations. DO NOT MERGE	Geoff Mendal	2015-04-29	1	-3/+5
\| \| \| \| \|	Change-Id: I43378ea885cdb018cd8b8cda5b8be304817e8ee8 Auto-generated-cl: translation import
*	Import translations. DO NOT MERGE	Geoff Mendal	2015-04-24	1	-6/+3
\| \| \| \| \|	Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92 Auto-generated-cl: translation import
*	Import translations. DO NOT MERGE	Geoff Mendal	2015-04-22	1	-0/+76
	Change-Id: I0893584e89cfc86caea9f5f5f43f8d7dd94873d8 Auto-generated-cl: translation import