frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
\| \| \| \| \| \| * \| \| \| \| \| \| \|	am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo...	Deepanshu Gupta	2014-06-03	1	-1/+1
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| \| * \| \| \| \| \| \|	am 03a83266: am 08d2007b: 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 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]	Deepanshu Gupta	2014-06-03	1	-12/+10
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|/ / / / / / /
\| \| \| \| \| \| \| * \| \| \| \| \| \|	am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]	Deepanshu Gupta	2014-06-03	1	-12/+10
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \|/ / / / / /
\| \| \| \| \| \| \| \| * \| \| \| \| \|	Remove @NonNull attribute [DO NOT MERGE]	Deepanshu Gupta	2014-05-30	1	-12/+10
\| \| \| \| * \| \| \| \| \| \| \| \| \|	am 12b657d7: am dade24b4: 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
\| \| \| \| * \| \| \| \| \| \| \| \| \|	am 2ac96a09: am a0fc1f46: 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 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://go...	Deepanshu Gupta	2014-06-04	3	-34/+55
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-andr...	Deepanshu Gupta	2014-06-04	3	-34/+55
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \|	am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesou...	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 81dfc082: Merge "Force all windows to redraw before unblanking screen" int...	Craig Mautner	2014-06-03	1	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Force all windows to redraw before unblanking screen" into klp-modular...	Craig Mautner	2014-06-03	1	-5/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Force all windows to redraw before unblanking screen	Craig Mautner	2014-06-02	1	-5/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7e547e0d: Merge "Add --pseudo-localize option to generate resources for ps...	Adam Lesinski	2014-06-03	1	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Add --pseudo-localize option to generate resources for pseudolocales."	Adam Lesinski	2014-06-03	1	-5/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Add --pseudo-localize option to generate resources for pseudolocales.	Igor Viarheichyk	2014-06-03	1	-5/+4
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 8af310c0: am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo...	Deepanshu Gupta	2014-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]	Deepanshu Gupta	2014-06-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / / / / \| \|/\| \| \| / / / / / / / / / / / \| \| \| \|_\|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am 8974a5e6: 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 6099fd21: Merge "Fix build." into klp-modular-dev	Jeff Brown	2014-05-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build.	Jeff Brown	2014-05-20	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 7dfe1fda: am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am c289ec6b: am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am 3a559d56: am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	am b5b47565: am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	am 98822f0e: am 6e923e1b: am 90d57721: am 209745a3: am c251147a: am 85ec1445:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|_\|/ / / / / / / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	am 90d57721: am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d:...	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|_\|/ / / / / / / \| \| \| \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \| \| \|	am 209745a3: am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build	Deepanshu Gupta	2014-05-14	1	-1/+0
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \|_\|/ / / / / / \| \| \| \| \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| \| \| \| \| * \| \| \| \| \| \| \|	am c251147a: am 85ec1445: am f266873c: am 1c55797d: Fix build	Deepanshu Gupta	2014-05-13	1	-1/+0
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \|_\|/ / / / / \| \| \| \| \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| \| \| \| \| * \| \| \| \| \| \|	am f266873c: am 1c55797d: Fix build	Deepanshu Gupta	2014-05-13	1	-1/+0
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \|_\|/ / / / \| \| \| \| \| \| \| \| \| \|/\| \| \| \| \|
\| \| \| \| \| \| \| \| \| * \| \| \| \| \|	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 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / / / /
\| \| \| \| \| * \| \| \| \| \| \| \| \| \| \|	am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce:...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|/ / / / / / / / / /
\| \| \| \| \| \| * \| \| \| \| \| \| \| \| \|	am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved con...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|/ / / / / / / / /
\| \| \| \| \| \| \| * \| \| \| \| \| \| \| \|	am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for me...	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \|/ / / / / / / /
\| \| \| \| \| \| \| \| * \| \| \| \| \| \| \|	am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev	Deepanshu Gupta	2014-05-13	1	-0/+2
\| \| \| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \|/ / / / / / /