frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am c0c39516: Merge "Hold a wake lock while dozing when display updates are pe...	Joe LaPenna	2015-02-24	1	-0/+5
\|\
\| *	Merge "Hold a wake lock while dozing when display updates are pending." into ...	Joe LaPenna	2015-02-24	1	-0/+5
\| \|\
\| \| *	Hold a wake lock while dozing when display updates are pending.	Jeff Brown	2015-02-20	1	-0/+5
* \| \|	am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set f...	Deepanshu Gupta	2015-02-23	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included la...	Deepanshu Gupta	2015-02-23	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into ...	Deepanshu Gupta	2015-02-23	1	-1/+1
\| \| \|\
\| \| \| *	Set forceFramework correctly for included layouts.	Deepanshu Gupta	2015-02-23	1	-1/+1
* \| \| \|	am 0a300b89: am ad879adb: Merge "Add Asset management support for fonts." int...	Deepanshu Gupta	2015-02-17	4	-20/+126
\|\ \ \ \ \| \|/ / /
\| * \| \|	am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev	Deepanshu Gupta	2015-02-17	4	-20/+126
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev	Deepanshu Gupta	2015-02-13	4	-20/+126
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Merge "Add Asset management support for fonts." into lmp-dev	Deepanshu Gupta	2015-02-13	4	-20/+126
\| \| \| \|\
\| \| \| \| *	Add Asset management support for fonts.	Deepanshu Gupta	2015-02-03	4	-20/+126
* \| \| \| \|	am a0fb87a3: am 98c3461a: Merge "Do not paint shadow if outside of the clip a...	Diego Perez	2015-02-17	1	-2/+7
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...	Diego Perez	2015-02-17	1	-2/+7
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp...	Diego Perez	2015-02-13	1	-2/+7
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Merge "Do not paint shadow if outside of the clip area" into lmp-dev	Diego Perez	2015-02-13	1	-2/+7
\| \| \| \|\ \
\| \| \| \| * \|	Do not paint shadow if outside of the clip area	Diego Perez	2015-02-04	1	-2/+7
* \| \| \| \| \|	am 221d7320: am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev ...	Deepanshu Gupta	2015-02-17	2	-3/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev	Deepanshu Gupta	2015-02-17	2	-3/+4
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev	Deepanshu Gupta	2015-02-13	2	-3/+4
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	Merge "Changes made by intelliJ 14.1" into lmp-dev	Deepanshu Gupta	2015-02-13	2	-3/+4
\| \| \| \|\ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| \| * \|	Changes made by intelliJ 14.1	Deepanshu Gupta	2015-02-04	2	-3/+4
\| \| \| \| \|/
* \| \| \| \|	am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lm...	Chris Warrington	2015-02-10	1	-15/+10
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Fix AAPT daemon mode with paths containg spaces.	Chris Warrington	2015-02-09	1	-15/+10
* \| \| \| \|	am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 778944...	Deepanshu Gupta	2015-01-31	5	-124/+452
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev	Deepanshu Gupta	2015-01-31	5	-124/+452
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev	Deepanshu Gupta	2015-01-31	5	-124/+452
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Limited AppCompat support	Deepanshu Gupta	2015-01-28	5	-124/+452
* \| \| \| \|	am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683...	Deepanshu Gupta	2015-01-31	2	-8/+24
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 1d59871e: Merge "Resource resolution fixes." into lmp-dev	Deepanshu Gupta	2015-01-31	2	-8/+24
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 1d59871e: Merge "Resource resolution fixes." into lmp-dev	Deepanshu Gupta	2015-01-31	2	-8/+24
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Resource resolution fixes.	Deepanshu Gupta	2015-01-15	2	-8/+24
\| \| \| \|/
* \| \| \|	Merge "Remove superfluous OpenSSL include paths." automerge: fe24754	Narayan Kamath	2015-01-23	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Remove superfluous OpenSSL include paths.	Adam Langley	2015-01-22	1	-1/+0
* \| \| \| \|	Merge "AAPT: Use the right enum when checking for density configurations" int...	Adam Lesinski	2015-01-23	1	-1/+1
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	AAPT: Use the right enum when checking for density configurations	Adam Lesinski	2015-01-22	1	-1/+1
* \| \| \| \|	am aee7225e: Merge "Process base APK" into lmp-mr1-dev	Adam Lesinski	2015-01-20	5	-88/+350
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Process base APK	Adam Lesinski	2015-01-16	5	-88/+350
* \| \| \| \|	am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute u...	Adam Lesinski	2015-01-14	3	-48/+127
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	AAPT: Handle all old unversioned attribute usage	Adam Lesinski	2015-01-14	3	-48/+127
* \| \| \| \|	am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387:...	Deepanshu Gupta	2015-01-10	1	-13/+23
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case...	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to...	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ...	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \| \| \|\ \
\| \| \| \| * \	am 74147527: am 8505c387: Special case AppCompat to show action bar.	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \| \| \| \|\ \
\| \| \| \| \| * \	am 8505c387: Special case AppCompat to show action bar.	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \|	Special case AppCompat to show action bar.	Deepanshu Gupta	2015-01-10	1	-13/+23
\| \| \| \| \| * \| \|	am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]	Deepanshu Gupta	2014-09-26	1	-2/+7
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| * \|	Fix error when using list as actionBarNavMode. [DO NOT MERGE]	Deepanshu Gupta	2014-09-25	1	-2/+7
\| \| \| \| \| * \| \|	am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" in...	Deepanshu Gupta	2014-09-04	1	-0/+4
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ /