frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 6ca82929: am c6e992a1: Merge "Frameworks/base: Wall Werror in libs/input"	Andreas Gampe	2014-11-11	3	-3/+10
\|\
\| *	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 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant."	Elliott Hughes	2014-11-10	1	-15/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	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 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings"	Andreas Gampe	2014-11-09	3	-11/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	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 1897a8e2: am 9ade8c1a: Merge "Frameworks/base: Wall Werror in libs/storage"	Andreas Gampe	2014-11-08	5	-13/+23
\|\ \ \ \ \| \|/ / /
\| * \| \|	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
* \| \| \|	am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-p...	Andreas Gampe	2014-11-07	10	-247/+410
\|\ \ \ \ \| \|/ / /
\| * \| \|	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 f1923c36: am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the ...	John Reck	2014-11-07	4	-0/+14
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	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
* \| \| \| \| \|	Fix DisplayListRenderer breakage	John Reck	2014-11-07	1	-0/+1
* \| \| \| \| \|	resolve merge conflicts of cabf8a7 to master.	John Reck	2014-11-07	4	-6/+9
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	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 86f289fb: am 0b70c09c: am 7ae6fc81: Merge "A better looking and faster spo...	ztenghui	2014-11-07	4	-651/+303
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	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
* \| \| \| \| \| \|	resolved conflicts for merge of be70c771 to master	John Reck	2014-11-06	7	-22/+35
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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 fce461ea: am db6a1358: am 6c96cbf5: Merge "Log shader source when it fails...	Rob Tsuk	2014-11-05	1	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	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 "Add a missing visibility modifier to fix build."	Dan Albert	2014-11-05	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add a missing visibility modifier to fix build.	Dan Albert	2014-11-05	1	-1/+1
* \| \| \| \| \| \| \|	am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-d...	Adam Lesinski	2014-11-05	1	-0/+4
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /
\| * \| \| \| \| \|	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
* \| \| \| \| \| \|	Replace StatefulBaseRenderer inheritance with CanvasState member	Tom Hudson	2014-11-04	10	-356/+511
* \| \| \| \| \| \|	Remove status return from all uirenderer::Renderer functions	Tom Hudson	2014-11-04	13	-407/+374