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	-0/+3
\| \| \| \| \| \| \| \| \|	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-03-20	1	-2/+1
\| \| \| \| \|	Change-Id: I6fd85e17705e81326d3440fc3ef2180683c968b3 Auto-generated-cl: translation import
*	Import translations. DO NOT MERGE	Geoff Mendal	2015-03-16	1	-1/+2
\| \| \| \| \|	Change-Id: I5059160456eb65bedb552f97b6ed500ef540839f Auto-generated-cl: translation import
*	Import translations. DO NOT MERGE	Geoff Mendal	2014-08-04	1	-0/+8
	Change-Id: Ic7ea16eebb01073ed3b3a120b0410fa17e173de3 Auto-generated-cl: translation import