frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am ccc956b2: am 41a8043b: Merge "Add a way to override Xfermode DO NOT MERGE"...	Rob Tsuk	2014-11-12	2	-12/+34
\|\
\| *	Merge "Add a way to override Xfermode DO NOT MERGE" into lmp-mr1-dev	Rob Tsuk	2014-11-12	2	-12/+34
\| \|\
\| \| *	Add a way to override Xfermode DO NOT MERGE	Rob Tsuk	2014-11-12	2	-12/+34
* \| \|	am ab6515f6: am 4e50ee4f: Merge "Shadow: Fix the crash in spot shadow" into l...	ztenghui	2014-11-12	1	-7/+13
\|\ \ \ \| \|/ /
\| * \|	Merge "Shadow: Fix the crash in spot shadow" into lmp-mr1-dev	ztenghui	2014-11-12	1	-7/+13
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Shadow: Fix the crash in spot shadow	ztenghui	2014-11-12	1	-7/+13
* \| \|	resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp	Dan Albert	2014-11-12	3	-5/+4
\|\ \ \
\| * \ \	Merge "Move frameworks/base over to libc++."	Dan Albert	2014-11-12	3	-5/+4
\| \|\ \ \
\| \| * \| \|	Move frameworks/base over to libc++.	Dan Albert	2014-11-12	3	-5/+4
* \| \| \| \|	am b93f8d02: Merge "Frameworks/base: Wall Werror in common_time"	Andreas Gampe	2014-11-12	7	-17/+23
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Frameworks/base: Wall Werror in common_time"	Andreas Gampe	2014-11-12	7	-17/+23
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Frameworks/base: Wall Werror in common_time	Andreas Gampe	2014-11-12	7	-17/+23
* \| \| \| \|	am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input"	Andreas Gampe	2014-11-11	3	-3/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Frameworks/base: Wall Werror in libs/input"	Andreas Gampe	2014-11-11	3	-3/+10
\| \|\ \ \ \
\| \| * \| \| \|	Frameworks/base: Wall Werror in libs/input	Andreas Gampe	2014-11-10	3	-3/+10
\| \| \|/ / /
* \| \| \| \|	resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp	Andreas Gampe	2014-11-10	21	-146/+158
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Frameworks/base: Wall Werror in libs/hwui"	Andreas Gampe	2014-11-11	20	-144/+152
\| \|\ \ \ \
\| \| * \| \| \|	Frameworks/base: Wall Werror in libs/hwui	Andreas Gampe	2014-11-10	20	-144/+152
\| \| \|/ / /
* \| \| \| \|	am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."	Elliott Hughes	2014-11-10	1	-15/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	bionic's struct stat is now POSIX-compliant.	Elliott Hughes	2014-11-10	1	-15/+4
* \| \| \| \|	am 189bf056: Merge "Frameworks/base: Fix more warnings"	Andreas Gampe	2014-11-09	3	-11/+5
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Frameworks/base: Fix more warnings"	Andreas Gampe	2014-11-09	3	-11/+5
\| \|\ \ \ \
\| \| * \| \| \|	Frameworks/base: Fix more warnings	Andreas Gampe	2014-11-07	3	-11/+5
\| \| \|/ / /
* \| \| \| \|	am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage"	Andreas Gampe	2014-11-08	5	-13/+23
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Frameworks/base: Wall Werror in libs/storage"	Andreas Gampe	2014-11-08	5	-13/+23
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Frameworks/base: Wall Werror in libs/storage	Andreas Gampe	2014-10-22	5	-13/+23
* \| \| \| \|	Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" int...	Andreas Gampe	2014-11-07	10	-247/+410
\|\ \ \ \ \
\| * \ \ \ \	resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp	Andreas Gampe	2014-11-07	10	-247/+410
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Frameworks/base: Wall Werror in libs/androidfw	Andreas Gampe	2014-11-07	10	-248/+410
* \| \| \| \| \|	am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lo...	John Reck	2014-11-07	4	-0/+14
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev	John Reck	2014-11-07	4	-0/+14
\| \|\ \ \ \
\| \| * \| \| \|	Have an actual fallback if the surface is lost	John Reck	2014-11-07	4	-0/+14
* \| \| \| \| \|	am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev	John Reck	2014-11-07	4	-6/+9
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Fix wrong-thread issue" into lmp-mr1-dev	John Reck	2014-11-07	4	-6/+9
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| * \| \| \|	Fix wrong-thread issue	John Reck	2014-11-07	4	-6/+9
\| \| \|/ / /
* \| \| \| \|	am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spot shadow." in...	ztenghui	2014-11-07	4	-651/+303
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "A better looking and faster spot shadow." into lmp-mr1-dev	ztenghui	2014-11-06	4	-651/+303
\| \|\ \ \ \
\| \| * \| \| \|	A better looking and faster spot shadow.	ztenghui	2014-11-06	4	-651/+303
* \| \| \| \| \|	am 327cb318: Merge "Yank ResourceCache out of Caches" into lmp-mr1-dev autome...	John Reck	2014-11-06	7	-22/+35
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Yank ResourceCache out of Caches	John Reck	2014-11-06	7	-22/+35
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails to compile" ...	Rob Tsuk	2014-11-05	1	-1/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Log shader source when it fails to compile" into lmp-mr1-dev	Rob Tsuk	2014-11-05	1	-1/+2
\| \|\ \ \ \
\| \| * \| \| \|	Log shader source when it fails to compile	Rob Tsuk	2014-11-05	1	-1/+2
* \| \| \| \| \|	Merge commit 'fb96e54' into manualmerge	Adam Lesinski	2014-11-05	1	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Add error checking to aapt for split generation" into lmp-mr1-dev	Adam Lesinski	2014-11-05	1	-0/+4
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Add error checking to aapt for split generation	Adam Lesinski	2014-11-03	1	-0/+4
* \| \| \| \| \|	am c4aea977: am e6c0bda5: Merge "Make points drawn with default paint visible...	Rob Tsuk	2014-11-04	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Make points drawn with default paint visible" into lmp-mr1-dev	Rob Tsuk	2014-11-04	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Make points drawn with default paint visible	Rob Tsuk	2014-11-04	1	-1/+1
* \| \| \| \| \|	Merge commit '78be0498' into manualmerge	Adam Lesinski	2014-11-03	4	-44/+32
\|\ \ \ \ \ \ \| \|/ / / / /