frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of ca762bee to master	Jean-Michel Trivi	2013-04-03	2	-2/+2
*	am e884f6b8: am dbd9c337: Merge "Change time format for default clock in keyg...	Jim Miller	2013-04-02	1	-1/+1
*	resolved conflicts for merge of 5856ee4b to master	Brian Colonna	2013-04-02	1	-2/+65
*	resolved conflicts for merge of 99bd302c to master	Jean-Michel Trivi	2013-03-29	2	-2/+4
*	resolved conflicts for merge of 2d9305cc to master	John Spurlock	2013-03-21	1	-0/+62
*	resolved conflicts for merge of 7d7443bc to master	Jim Miller	2013-03-19	5	-157/+213
*	am e8b24ddd: am adb9554d: Merge "Enable back button in keyguard security acco...	John Spurlock	2013-03-14	1	-3/+18
*	am 3fe0205a: am 6d4dac74: Merge "Fix bug where Keyguard\'s emergencydialer wa...	Jim Miller	2013-03-14	1	-1/+3
*	resolved conflicts for merge of 8f4772fe to master	Jim Miller	2013-03-12	1	-0/+3
*	am 0e23dd63: am 998b692d: Merge "Keyguard remote control display artwork size...	Jean-Michel Trivi	2013-03-12	1	-0/+9
*	Re-enable USER_PRESENT broadcast in keyguard.	Jim Miller	2013-02-28	1	-10/+5
*	Post-review Keyguard cleanup.	Jim Miller	2013-02-28	4	-56/+58
*	Merge "Fix dependency between keyguard/dexopt/AccessibilityManagerService."	Jim Miller	2013-02-28	1	-4/+0
\|\
\| *	Fix dependency between keyguard/dexopt/AccessibilityManagerService.	Jim Miller	2013-02-28	1	-4/+0
* \|	Fix bad merge in KeyguardHostView	Jim Miller	2013-02-27	1	-17/+11
\|/
*	Move keyguard to its own process.	Jim Miller	2013-02-27	52	-240/+691
*	Move keyguard source and resources into new package	Jim Miller	2013-02-27	49	-0/+18362