frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null va...	Alan Viverette	2014-10-31	1	-1/+15
\|\
\| *	Distinguish unspecified and explicit null values in resources	Alan Viverette	2014-10-29	1	-1/+15
* \|	am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev	John Reck	2014-10-30	1	-5/+4
\|\ \ \| \|/
\| *	Merge "Be more conservative about current buffer" into lmp-mr1-dev	John Reck	2014-10-29	1	-5/+4
\| \|\
\| \| *	Be more conservative about current buffer	John Reck	2014-10-27	1	-5/+4
* \| \|	am 4ed472ab: resolved conflicts for merge of 3028394c to stage-aosp-master	Narayan Kamath	2014-10-29	2	-1/+9
\|\ \ \
\| * \ \	resolved conflicts for merge of 3028394c to stage-aosp-master	Narayan Kamath	2014-10-29	2	-1/+9
\| \|\ \ \
\| \| * \| \|	Suppress Clang compilation warnings.	Chih-Hung Hsieh	2014-10-24	6	-7/+17
\| * \| \| \|	Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master	Bill Yi	2014-10-22	204	-6025/+26993
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	am aeef612f: Merge "Search all packages for a given type string when looking ...	Adam Lesinski	2014-10-09	2	-43/+60
\| \| \|\ \ \
\| \| * \ \ \	am d988a45d: Merge "Cleanup DeferredLayerUpdater" into lmp-dev	John Reck	2014-10-03	6	-41/+36
\| \| \|\ \ \ \
\| \| * \ \ \ \	am f9033048: Merge "+ correcting shadow visual appearance (b/17610926)" into ...	ztenghui	2014-10-01	1	-1/+1
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a s...	Adam Powell	2014-10-01	1	-5/+1
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared li...	Adam Lesinski	2014-10-01	1	-1/+5
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	am fd0a1df1: am 737dfe57: Merge "Reject transparent draws more conservatively...	Chris Craik	2014-09-23	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	am 91a40be0: am fe01ab10: Merge "Account for alpha in hasShadow()" into lmp-dev	Chris Craik	2014-09-19	1	-1/+3
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp	Dan Albert	2014-09-19	2	-3/+6
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp	Dan Albert	2014-09-19	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	am 8bdb265f: am 19f9d54f: Merge "Fix backwards compat problem with AAPT publi...	Adam Lesinski	2014-09-19	2	-1/+41
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	am 923ccf24: am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev	John Reck	2014-09-19	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into...	Chris Craik	2014-09-19	4	-2/+15
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	am a19867e1: am fd340229: Merge "Special case EGL_BAD_SURFACE" into lmp-dev	John Reck	2014-09-17	3	-6/+20
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am d0738f9c: am 8523ad90: Merge "Change default fbo cache size to 0" into lmp...	John Reck	2014-09-17	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am befbdaba: am b5a27aee: Merge "Handle premultiplication correctly for Color...	Chris Craik	2014-09-17	2	-1/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples"...	Jorim Jaggi	2014-09-16	3	-0/+49
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 4dae506c: am e27790db: Merge "Force isolation of clip and matrix within la...	Chris Craik	2014-09-15	2	-0/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am 31b76b66: Merge "libandroidfw: Do not build device library when building S...	Adam Lesinski	2014-10-28	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "libandroidfw: Do not build device library when building SDK" into lmp-...	Adam Lesinski	2014-10-28	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	libandroidfw: Do not build device library when building SDK	Adam Lesinski	2014-10-24	1	-0/+3
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad	John Reck	2014-10-28	9	-93/+58
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup debug options	John Reck	2014-10-27	9	-93/+58
\| \|/ / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 879f237a: Merge "Added some more Split density tests" into lmp-mr1-dev	Adam Lesinski	2014-10-24	36	-157/+803
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Added some more Split density tests" into lmp-mr1-dev	Adam Lesinski	2014-10-23	36	-157/+803
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added some more Split density tests	Adam Lesinski	2014-10-23	36	-157/+803
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" in...	John Reck	2014-10-23	6	-27/+62
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev	John Reck	2014-10-23	6	-27/+62
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some free zoom to lockHardwareCanvas	John Reck	2014-10-23	6	-27/+62
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev	John Reck	2014-10-23	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix damage bug	John Reck	2014-10-22	1	-0/+3
\| \|/ / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 733bb3bc: Merge "Fix memory corruption in test" into lmp-mr1-dev	John Reck	2014-10-22	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix memory corruption in test" into lmp-mr1-dev	John Reck	2014-10-22	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix memory corruption in test	John Reck	2014-10-16	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev	John Reck	2014-10-21	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Surface:lockHardwareCanvas	John Reck	2014-10-21	2	-3/+3
\| \|/ / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."	Dan Albert	2014-10-21	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More LOCAL_ADDITIONAL_DEPENDENCIES.	Dan Albert	2014-10-21	1	-0/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am f3259620: am 94c40fe9: CARD LAND!	John Reck	2014-10-14	4	-0/+263
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CARD LAND!	John Reck	2014-10-14	4	-0/+263
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 983b668b: am be003a35: am f23e3ea6: am aeef612f: Merge "Search all package...	Adam Lesinski	2014-10-10	2	-43/+60
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am f23e3ea6: am aeef612f: Merge "Search all packages for a given type string ...	Adam Lesinski	2014-10-10	2	-43/+60
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|