frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 1c55797d: Fix build	Deepanshu Gupta	2014-05-13	1	-1/+0
\|\
\| *	Fix build	Deepanshu Gupta	2014-05-13	1	-1/+0
* \|	am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correct...	Deepanshu Gupta	2014-05-13	1	-1/+1
\|\ \ \| \|/
\| *	am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-d...	Deepanshu Gupta	2014-05-13	1	-1/+1
\| \|\
\| \| *	Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp	Deepanshu Gupta	2014-05-13	1	-1/+1
\| \| \|\
\| \| \| *	resolve conflicts for merge 5a7b3b65 correctly	Deepanshu Gupta	2014-05-12	1	-1/+1
* \| \| \|	am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev	Deepanshu Gupta	2014-05-13	1	-0/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	resolved conflicts for merge of 7377c7be to jb-mr1-dev	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 3a115628: Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	2	-6/+8
\| \| \|\ \
\| \| \| * \|	Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	2	-6/+8
* \| \| \| \|	am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute ...	Deepanshu Gupta	2014-05-13	2	-3/+26
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO...	Deepanshu Gupta	2014-05-13	2	-3/+26
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	2	-3/+26
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Support actionProviderClass attribute for menus [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	2	-3/+26
* \| \| \| \|	am b6de60e0: am df2da3d7: am 7bc363ba: Add special system view cookie to Over...	Deepanshu Gupta	2014-05-13	1	-1/+28
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am df2da3d7: am 7bc363ba: Add special system view cookie to OverflowButton. [...	Deepanshu Gupta	2014-05-13	1	-1/+28
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 7bc363ba: Add special system view cookie to OverflowButton. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-1/+28
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Add special system view cookie to OverflowButton. [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	1	-1/+28
* \| \| \| \|	am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in e...	Deepanshu Gupta	2014-05-13	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO ...	Deepanshu Gupta	2014-05-13	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Use ApplicationInfo only when not in edit mode [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	1	-1/+1
* \| \| \| \|	am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev	Deepanshu Gupta	2014-05-13	1	-47/+44
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of 00d09649 to jb-mr1-dev	Deepanshu Gupta	2014-05-13	1	-47/+44
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 85f53c33: Fix style warnings in RenderSessionImpl [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-47/+44
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix style warnings in RenderSessionImpl [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	1	-47/+44
* \| \| \| \|	am 5280c911: am 0df5ae65: am 0f209967: Add view cookies for action bar menus....	Deepanshu Gupta	2014-05-13	8	-53/+292
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 0df5ae65: am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	8	-53/+292
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 0f209967: Add view cookies for action bar menus. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	8	-53/+292
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Add view cookies for action bar menus. [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	8	-53/+292
* \| \| \| \|	am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge ac...	Deepanshu Gupta	2014-05-13	1	-0/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Add missing layout params to xlarge action bar. [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	1	-0/+2
* \| \| \| \|	am 1867f58d: am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in ...	Deepanshu Gupta	2014-05-13	6	-91/+396
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 3027b69e: am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO...	Deepanshu Gupta	2014-05-13	6	-91/+396
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am f7e57949: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	6	-91/+396
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-07	6	-91/+396
* \| \| \| \|	am a5461ebf: resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev	Deepanshu Gupta	2014-05-13	12	-144/+445
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev	Deepanshu Gupta	2014-05-13	12	-144/+445
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 43b15371: Action bar rendering in layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	12	-151/+444
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Action bar rendering in layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-06	12	-151/+444
* \| \| \| \|	am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutli...	Deepanshu Gupta	2014-05-13	5	-14/+155
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	5	-14/+155
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	5	-14/+155
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix theme/style resolution in Layoutlib [DO NOT MERGE]	Deepanshu Gupta	2014-05-06	5	-14/+155
* \| \| \| \|	am 5594616c: am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create...	Deepanshu Gupta	2014-05-13	5	-6/+34
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 9602fc1c: am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	5	-6/+34
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 87665388: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]	Deepanshu Gupta	2014-05-13	5	-6/+34
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]	Deepanshu Gupta	2014-05-06	5	-6/+34