frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 9a61270d: Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into kl...	Deepanshu Gupta	2014-07-22	5	-35/+107
\|\
\| *	LayoutLib: Fix EditText rendering [DO NOT MERGE]	Deepanshu Gupta	2014-07-21	5	-35/+107
* \|	am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-m...	Deepanshu Gupta	2014-07-22	1	-138/+128
\|\ \ \| \|/
\| *	Update layoutlib create README [DO NOT MERGE]	Deepanshu Gupta	2014-07-21	1	-138/+128
* \|	am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles...	Deepanshu Gupta	2014-07-18	1	-10/+7
\|\ \ \| \|/
\| *	am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [...	Deepanshu Gupta	2014-07-18	1	-10/+7
\| \|\
\| \| *	am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]...	Deepanshu Gupta	2014-07-18	1	-10/+7
\| \| \|\
\| \| \| *	Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev	Deepanshu Gupta	2014-07-17	1	-10/+7
\| \| \| \|\
\| \| \| \| *	Fix style resolution for styles with '.' [DO NOT MERGE]	Deepanshu Gupta	2014-07-09	1	-10/+7
* \| \| \| \|	am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO ...	Deepanshu Gupta	2014-07-18	1	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]	Deepanshu Gupta	2014-07-18	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]	Deepanshu Gupta	2014-07-18	1	-2/+2
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix default level flags for bidi. [DO NOT MERGE]	Deepanshu Gupta	2014-07-12	1	-2/+2
\| \| \| \|/
* \| \| \|	DO NOT MERGE - Fix LayoutLib.	Deepanshu Gupta	2014-07-16	2	-17/+18
* \| \| \|	am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]	Deepanshu Gupta	2014-07-08	2	-49/+120
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]	Deepanshu Gupta	2014-07-08	2	-49/+120
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 8e11659a: Change font family name. [DO NOT MERGE]	Deepanshu Gupta	2014-07-08	2	-49/+120
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Change font family name. [DO NOT MERGE]	Deepanshu Gupta	2014-07-07	2	-49/+120
* \| \| \|	am f8077cf2: am 8e21e215: Merge "Switch from core to core-libart"	Brian Carlstrom	2014-06-19	1	-2/+2
\|\ \ \ \
\| * \ \ \	am 8e21e215: Merge "Switch from core to core-libart"	Brian Carlstrom	2014-06-19	1	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Switch from core to core-libart	Brian Carlstrom	2014-06-18	1	-2/+2
\| \| * \| \| \|	Add missing dependency in layoutlib build file [DO NOT MERGE]	Deepanshu Gupta	2014-06-05	1	-0/+1
\| \|/ / / /
* \| \| \| \|	am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. ...	Deepanshu Gupta	2014-06-18	4	-0/+207
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]	Deepanshu Gupta	2014-06-18	4	-0/+207
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]	Deepanshu Gupta	2014-06-18	4	-0/+207
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Add a script to rename fonts for SDK. [DO NOT MERGE]	Deepanshu Gupta	2014-06-12	4	-0/+207
* \| \| \| \|	am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modul...	Deepanshu Gupta	2014-06-12	6	-15/+32
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	LayoutLib fixes for API 20 [DO NOT MERGE]	Deepanshu Gupta	2014-06-12	8	-22/+44
* \| \| \| \|	am 905e113f: am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \|\ \
\| \| \| \| * \	am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \| \|\ \
\| \| \| \| \| * \	am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120:...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \	am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved con...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| * \	am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for me...	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| * \	am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev	Deepanshu Gupta	2014-06-04	1	-0/+1
\| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| * \	am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| * \	resolved conflicts for merge of 61fb5784 to jb-mr1-dev	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| * \	am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| * \|	Distinguish between menus in ActionBar and popup. [DO NOT MERGE]	Deepanshu Gupta	2014-05-30	3	-34/+55
\| \| \| \| \| \| \| \| \| * \| \| \| \|	am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo...	Deepanshu Gupta	2014-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \|/ / / /
\| \| \| \| \| \| \| \| \| \| * \| \| \|	am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]	Deepanshu Gupta	2014-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|/ / /
\| \| \| \| \| \| \| \| \| \| \| * \| \|	am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]	Deepanshu Gupta	2014-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| \| \| \| \| \| \| * \|	LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]	Deepanshu Gupta	2014-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| * \| \| \| \|	am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-13/+7
\| \| \| \| \| \| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \|/ / / /
\| \| \| \| \| \| \| \| \| \| * \| \| \|	Fix build due to incorrect merges [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-13/+7
\| \| \| \| \| \| * \| \| \| \| \| \| \|	am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in Ac...	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| \| * \| \| \| \| \| \|	am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and p...	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \|/ / / / / /
\| \| \| \| \| \| \| \| * \| \| \| \| \|	Distinguish between menus in ActionBar and popup. [DO NOT MERGE]	Deepanshu Gupta	2014-05-30	3	-34/+55