frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996	Conley Owens	2011-04-27	1	-1/+2
\|\
\| *	Merge changes I0ab47e2f,Ib8016996	Conley Owens	2011-04-27	1	-1/+2
\| \|\
\| \| *	Normalize output of XMLtree content	Shachar Shemesh	2011-04-11	1	-1/+2
* \| \|	am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."	Kenny Root	2011-04-11	3	-1/+12
\|\ \ \ \| \|/ /
\| * \|	Runtime resource overlay, iteration 1.	Mårten Kongstad	2011-04-01	3	-1/+12
\| \|/
* \|	am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0...	Xavier Ducrohet	2011-04-06	2	-18/+35
\|\ \
\| * \|	LayoutLib: don't render when shader's local matrix is set to 0 scale.	Xavier Ducrohet	2011-04-06	2	-18/+35
* \| \|	am 8a18dba4: Merge c5aeac7f from honeycomb.	Xavier Ducrohet	2011-04-06	1	-23/+75
\|\ \ \ \| \|/ /
\| * \|	Merge c5aeac7f from honeycomb.	Xavier Ducrohet	2011-04-06	1	-23/+75
* \| \|	am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.	Xavier Ducrohet	2011-03-17	1	-11/+4
\|\ \ \ \| \|/ /
\| * \|	Merge 67450db0 from honeycomb. Do not merge.	Xavier Ducrohet	2011-03-17	1	-11/+4
* \| \|	am 0a98226e: Merge 9d76581f from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	2	-30/+52
\|\ \ \ \| \|/ /
\| * \|	Merge 9d76581f from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	2	-30/+52
* \| \|	am b243aabd: Merge adaa12cd from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	3	-12/+23
\|\ \ \ \| \|/ /
\| * \|	Merge adaa12cd from honeycomb. do not merge.	Xavier Ducrohet	2011-03-15	3	-12/+23
* \| \|	am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into ginger...	Xavier Ducrohet	2011-03-15	2	-14/+10
\|\ \ \ \| \|/ /
\| * \|	Merge 6f2fb570 from honeycomb. do not merge.	Xavier Ducrohet	2011-03-14	2	-14/+10
* \| \|	am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into ginger...	Xavier Ducrohet	2011-03-15	1	-25/+80
\|\ \ \ \| \|/ /
\| * \|	Merge c12b4093 from honeycomb. do not merge.	Xavier Ducrohet	2011-03-14	1	-25/+80
* \| \|	am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into ging...	Xavier Ducrohet	2011-02-28	12	-66/+67
\|\ \ \ \| \|/ /
\| * \|	Merge 1911a6f7 into gingerbread. do not merge.	Xavier Ducrohet	2011-02-25	12	-66/+67
* \| \|	am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	am dff6b8e7: Merge "Add --non-constant-id to aapt."	Xavier Ducrohet	2011-02-28	3	-6/+20
\| \|\ \
\| \| * \|	Add --non-constant-id to aapt.	Xavier Ducrohet	2011-02-14	3	-6/+20
* \| \| \|	am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." i...	Xavier Ducrohet	2011-02-24	40	-1422/+296
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	LayoutLib: Adapt the HC layoutlib to GB. do not merge.	Xavier Ducrohet	2011-02-23	40	-1422/+296
* \| \| \|	resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp	Xavier Ducrohet	2011-02-24	138	-8365/+17266
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	LayoutLib: Original import of Honeycomb's layoutlib. do not merge.	Xavier Ducrohet	2011-02-23	141	-8401/+17623
* \| \|	am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-2/+4
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "Normalize output from aapt d"	Dianne Hackborn	2011-01-29	1	-2/+4
\| \|\ \
\| \| * \|	Normalize output from aapt d	Shachar Shemesh	2011-01-04	1	-2/+4
* \| \| \|	am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"	Dianne Hackborn	2011-01-29	1	-5/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Make AaptGroupEntry::getMncName accept mnc00"	Dianne Hackborn	2011-01-29	1	-5/+3
\| \|\ \ \
\| \| * \| \|	Make AaptGroupEntry::getMncName accept mnc00	Johan Redestig	2011-01-04	1	-5/+3
\| \| \|/ /
* \| \| \|	am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"	Dianne Hackborn	2011-01-23	1	-0/+16
\|\ \ \ \ \| \|/ / /
\| * \| \|	aapt: Allow raw "%" in unformatted string-arrays	Josh Stone	2011-01-22	1	-0/+16
\| \|/ /
* \| \|	am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename ta...	Dan Morrill	2010-12-14	1	-2/+2
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	GL texture filtering changed from AND to OR, so rename tag name to match.	Dan Morrill	2010-12-13	1	-2/+2
* \|	am 5580e44c: Merge "Support changing style parent in overlays"	Jean-Baptiste Queru	2010-11-05	1	-14/+0
\|\ \
\| * \	Merge "Support changing style parent in overlays"	Jean-Baptiste Queru	2010-11-04	1	-14/+0
\| \|\ \
\| \| * \|	Support changing style parent in overlays	Martin Nordholts	2010-08-17	1	-14/+0
* \| \| \|	am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread	Scott Main	2010-11-05	1	-2/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	fix xlarge support in aapt for gingerbread	Scott Main	2010-11-04	1	-2/+2
* \| \| \|	am 63e5d07e: Merge "Fix issue with project resources overriding framework res...	Xavier Ducrohet	2010-10-27	3	-19/+22
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix issue with project resources overriding framework resources.	Xavier Ducrohet	2010-10-26	3	-19/+22
* \| \| \|	am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors....	Xavier Ducrohet	2010-10-26	3	-11/+104
\|\ \ \ \ \| \|/ / /
\| * \| \|	Fix rendering of digitalClock/Gallery in Eclipse editors.	Xavier Ducrohet	2010-10-26	3	-11/+104
* \| \| \|	am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"	Xavier Ducrohet	2010-10-22	2	-2/+2
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Make layoutlib use the prebuilt of layoutlib_api	Xavier Ducrohet	2010-10-21	2	-2/+2
* \| \| \|	am ba501785: Merge "Implement issue #3116702: New manifest tags for supported...	Dianne Hackborn	2010-10-21	1	-9/+50
\|\ \ \ \ \| \| \|/ / \| \|/\| \|