frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 2f6a2526 to master	Jim Miller	2013-04-17	1	-7/+20
\|\
* \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-04-17	1	-1/+1
* \|	am 21f492b7: am cfd48d77: Merge "Rebuild quick settings tile layouts." into j...	Daniel Sandler	2013-04-16	22	-395/+308
\|\ \ \| \|/
\| *	am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev	Daniel Sandler	2013-04-16	22	-395/+308
\| \|\
\| \| *	Rebuild quick settings tile layouts.	Daniel Sandler	2013-04-15	22	-395/+308
* \| \|	Hideybars part I - Overlay status bar via an intent.	John Spurlock	2013-04-16	1	-3/+54
* \| \|	am df6db6ad: am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug...	Brian Colonna	2013-04-15	3	-4/+22
\|\ \ \ \| \|/ /
* \| \|	Merge "Import translations. DO NOT MERGE"	Baligh Uddin	2013-04-15	1	-1/+1
\|\ \ \
\| * \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-04-15	1	-1/+1
* \| \| \|	am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the bo...	Daniel Sandler	2013-04-15	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	am bd573049: Merge "Putting the gesture debugging back in the box." into jb-m...	Daniel Sandler	2013-04-15	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Merge "Putting the gesture debugging back in the box." into jb-mr2-dev	Daniel Sandler	2013-04-15	1	-1/+1
\| \| \|\
\| \| \| *	Putting the gesture debugging back in the box.	Daniel Sandler	2013-04-11	1	-1/+1
* \| \| \|	am bc708d8b: am c309ca46: Merge "Fix issue #8582003: Evernote Camera Capture ...	Dianne Hackborn	2013-04-11	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c309ca46: Merge "Fix issue #8582003: Evernote Camera Capture Failure" into...	Dianne Hackborn	2013-04-11	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix issue #8582003: Evernote Camera Capture Failure	Dianne Hackborn	2013-04-11	1	-1/+1
\| \| \|/
* \| \|	am cce961c1: am 22626107: Merge "Fix bug where transport shows all the time i...	Jim Miller	2013-04-11	3	-21/+58
\|\ \ \ \| \|/ /
* \| \|	am 3ef8f64d: am 5c58a916: Merge "Fix missing clock in keyguard" into jb-mr2-dev	Jim Miller	2013-04-10	2	-3/+10
\|\ \ \ \| \|/ /
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-04-10	1	-1/+1
* \| \|	resolved conflicts for merge of a976bddd to master	Ying Wang	2013-04-09	1	-2/+3
\|\ \ \ \| \|/ /
\| * \|	am d8b26d6c: Merge "Add liblog" into jb-mr2-dev	Ying Wang	2013-04-09	1	-2/+3
\| \|\ \ \| \| \|/
\| \| *	Add liblog	Ying Wang	2013-04-09	1	-2/+3
* \| \|	am 7449844f: am 104ca45a: Merge "Fix janky icon fade-in animation in Recents"...	Michael Jurka	2013-04-08	2	-47/+155
\|\ \ \ \| \|/ /
\| * \|	am 104ca45a: Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev	Michael Jurka	2013-04-08	2	-47/+155
\| \|\ \ \| \| \|/
\| \| *	Merge "Fix janky icon fade-in animation in Recents" into jb-mr2-dev	Michael Jurka	2013-04-09	2	-47/+155
\| \| \|\
\| \| \| *	Fix janky icon fade-in animation in Recents	Michael Jurka	2013-04-08	2	-47/+155
* \| \| \|	resolved conflicts for merge of 21dffd5d to master	Jeff Brown	2013-04-08	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 3a2854bc: Merge "Queues, queues, queues and input." into jb-mr2-dev	Jeff Brown	2013-04-08	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Queues, queues, queues and input." into jb-mr2-dev	Jeff Brown	2013-04-08	1	-1/+1
\| \| \|\ \
\| \| \| * \|	Queues, queues, queues and input.	Jeff Brown	2013-04-08	1	-1/+1
* \| \| \| \|	am fc9b371e: am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr...	John Spurlock	2013-04-08	1	-0/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev	John Spurlock	2013-04-08	1	-0/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Awaken dreams on home + recents.	John Spurlock	2013-04-08	1	-0/+1
\| \| \| \|/ \| \| \|/\|
* \| \| \|	resolved conflicts for merge of 29211d3a to master	John Spurlock	2013-04-05	9	-19/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 5feceebb: New NotificationListenerService.	Daniel Sandler	2013-04-05	9	-19/+8
\| \|\ \ \ \| \| \|/ /
\| \| * \|	New NotificationListenerService.	Daniel Sandler	2013-04-05	9	-19/+8
\| \| \|/
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-04-05	1	-1/+1
* \| \|	am ca5ecdc2: am 9658de2d: Merge "Add new physical keyboard layouts."	Jeff Brown	2013-04-05	4	-0/+732
\|\ \ \ \| \|/ /
\| * \|	am 9658de2d: Merge "Add new physical keyboard layouts."	Jeff Brown	2013-04-05	4	-0/+732
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Add new physical keyboard layouts.	Olivier Gay	2013-03-30	4	-0/+732
* \| \|	resolved conflicts for merge of ca762bee to master	Jean-Michel Trivi	2013-04-03	2	-2/+2
\|\ \ \ \| \|/ /
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-04-03	1	-1/+1
* \| \|	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
\|\ \ \ \| \|/ /
* \| \|	am 0853ec15: am 3a5a7749: Fixing NPE on screenshot error. (Bug 8328886)	Winson Chung	2013-04-02	2	-28/+6
\|\ \ \ \| \|/ /
\| * \|	Fixing NPE on screenshot error. (Bug 8328886)	Winson Chung	2013-04-01	2	-28/+6
* \| \|	resolved conflicts for merge of 15935aad to master	Amith Yamasani	2013-03-30	2	-5/+3
\|\ \ \ \| \|/ /
\| * \|	Block access to accounts for limited users.	Amith Yamasani	2013-03-30	2	-5/+3
* \| \|	am d680287b: am cb5a4bf2: Merge "Apparently SystemUI no longer needs the caro...	Dianne Hackborn	2013-03-29	1	-3/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Apparently SystemUI no longer needs the carousel." into jb-mr2-dev	Dianne Hackborn	2013-03-29	1	-3/+0
\| \|\ \