frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into ginge...	Xavier Ducrohet	2011-06-28	12	-192/+322
\|\
\| *	Bring in more layout lib changes from hc-mr1.	Xavier Ducrohet	2011-06-16	12	-192/+322
* \|	am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into ging...	Xavier Ducrohet	2011-06-28	2	-4/+9
\|\ \ \| \|/
\| *	CherryPick 06942bc4 from hc-mr1. do not merge.	Xavier Ducrohet	2011-06-16	2	-4/+9
* \|	am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into ging...	Xavier Ducrohet	2011-06-28	3	-16/+49
\|\ \ \| \|/
\| *	CherryPick 988eeeb5 from hc-mr1. do not merge.	Xavier Ducrohet	2011-06-16	3	-16/+49
* \|	am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods."	Raphael Moll	2011-06-22	8	-117/+319
\|\ \
\| * \|	Laoutlib_creator: keep original of delegate methods.	Raphael Moll	2011-06-17	8	-117/+319
* \| \|	am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into ging...	Xavier Ducrohet	2011-06-06	3	-0/+86
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Cherrypick d1ed33c4 from hc-mr1. do not merge.	Xavier Ducrohet	2011-06-03	3	-0/+86
* \| \|	am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread	Xavier Ducrohet	2011-06-06	9	-18/+15
\|\ \ \ \| \|/ /
\| * \|	Cherrypick 5b61ea6b from hc-mr1	Xavier Ducrohet	2011-06-03	1	-1/+1
\| * \|	LayoutLib: enable the LAYOUT_ONLY capability.	Xavier Ducrohet	2011-06-02	1	-1/+1
\| * \|	Merge dba35f1b from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-06-01	7	-16/+13
* \| \|	am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-24	1	-53/+58
\|\ \ \ \| \|/ /
\| * \|	Merge 6103e22c from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-24	1	-53/+58
* \| \|	am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-24	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge 2402ad60 from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-23	1	-1/+1
* \| \|	am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-23	3	-32/+72
\|\ \ \ \| \|/ /
\| * \|	Merge e57aa434 from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-20	3	-32/+72
* \| \|	am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gi...	Xavier Ducrohet	2011-05-23	3	-22/+33
\|\ \ \ \| \|/ /
\| * \|	Merge 05b7b69c from honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-19	3	-22/+33
* \| \|	am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gi...	Xavier Ducrohet	2011-05-23	11	-51/+799
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\|
\| *	Merge 2fae858d from Honeycomb-mr1. do not merge.	Xavier Ducrohet	2011-05-19	11	-51/+799
* \|	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