frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	resolved conflicts for merge of a976bddd to master	Ying Wang	2013-04-09	3	-4/+6
\|\ \ \ \| \|/ /
\| * \|	Add liblog	Ying Wang	2013-04-09	3	-4/+6
* \| \|	resolved conflicts for merge of 21dffd5d to master	Jeff Brown	2013-04-08	3	-23/+10
\|\ \ \ \| \|/ /
\| * \|	Merge "Queues, queues, queues and input." into jb-mr2-dev	Jeff Brown	2013-04-08	3	-23/+10
\| \|\ \
\| \| * \|	Queues, queues, queues and input.	Jeff Brown	2013-04-08	3	-23/+10
* \| \| \|	am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permissi...	Nick Kralevich	2013-04-04	1	-0/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "aapt: add support for optional uses-permission" into jb-mr2-dev	Nick Kralevich	2013-04-05	1	-0/+8
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	aapt: add support for optional uses-permission	Nick Kralevich	2013-04-03	1	-0/+8
* \| \| \|	resolved conflicts for merge of 5856ee4b to master	Brian Colonna	2013-04-02	1	-0/+4
\|\ \ \ \ \| \|/ / /
\| * \| \|	FUL now restarts when flipping tablet 180 (bug 7484464)	Brian Colonna	2013-03-29	1	-0/+4
\| \|/ /
* \| \|	am 483ac9a7: am b404ecc9: Merge "Fix build." into jb-mr2-dev	Dianne Hackborn	2013-03-26	1	-0/+21
\|\ \ \ \| \|/ /
\| * \|	Fix build.	Dianne Hackborn	2013-03-26	1	-0/+21
* \| \|	Update layoutlib to latest interface.	Craig Mautner	2013-03-18	1	-2/+2
* \| \|	am 892e0782: am ad4a174b: Merge "Fix build." into jb-mr2-dev	Dianne Hackborn	2013-03-05	1	-0/+7
\|\ \ \ \| \|/ /
\| * \|	Fix build.	Dianne Hackborn	2013-03-05	1	-0/+7
\| * \|	Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev	Craig Mautner	2013-02-26	1	-0/+18
\| \|\ \ \|/ / /
\| * \|	Revert ActivityManager changes for tasks. DO NOT MERGE	Craig Mautner	2013-02-25	1	-0/+18
* \| \|	Fix typo.	Dianne Hackborn	2013-02-25	1	-1/+1
\|/ /
* \|	Formalize overscan metrics.	Dianne Hackborn	2013-02-22	2	-2/+2
* \|	am ec6156f9: Merge "Fix the build."	Jim Miller	2013-02-20	1	-0/+8
\|\ \
\| * \|	Fix the build.	Jim Miller	2013-02-20	1	-0/+8
* \| \|	am ee973c27: Fix build.	Dianne Hackborn	2013-02-19	1	-0/+6
\|\ \ \ \| \|/ /
\| * \|	Fix build.	Dianne Hackborn	2013-02-19	1	-0/+6
* \| \|	am 7c93839d: Revert "Tentative fix for aidl import issue"	Laurent Tu	2013-02-15	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Revert "Tentative fix for aidl import issue"	Laurent Tu	2013-02-15	1	-1/+1
* \| \|	am 8acb27c5: Merge "Tentative fix for aidl import issue"	Laurent Tu	2013-02-15	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	Merge "Tentative fix for aidl import issue"	Laurent Tu	2013-02-15	1	-1/+1
\| \|\ \
\| \| * \|	Tentative fix for aidl import issue	Laurent Tu	2013-02-14	1	-1/+1
* \| \| \|	am 534d136a: Merge "Remove unused App methods."	Craig Mautner	2013-02-14	1	-18/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Remove unused App methods.	Craig Mautner	2013-02-13	1	-18/+0
\| * \| \|	Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog...	Chris Craik	2013-02-13	1	-0/+5
\| \|\ \ \ \|/ / / /
\| * \| \|	Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...	Chris Craik	2013-02-13	1	-0/+5
* \| \| \|	Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!"	Dianne Hackborn	2013-02-12	1	-0/+5
\|\ \ \ \
\| * \| \| \|	Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!	Dianne Hackborn	2013-02-12	1	-0/+5
\| \|/ / /
* \| \| \|	am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for...	Xavier Ducrohet	2013-02-12	2	-0/+38
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." ...	Xavier Ducrohet	2013-02-12	2	-0/+38
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1...	Xavier Ducrohet	2013-02-12	2	-0/+38
\| \| \|\ \
\| \| \| * \	am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev	Xavier Ducrohet	2013-02-12	2	-0/+38
\| \| \| \|\ \
\| \| \| \| * \|	Fix DateFormat for layoutlib.	Xavier Ducrohet	2013-02-12	2	-0/+38
\| * \| \| \| \|	am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev	Justin Koh	2013-01-16	1	-19/+0
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Remove doSingleCrunch call DO NOT MERGE	Justin Koh	2013-01-16	1	-19/+0
* \| \| \| \| \|	Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"	Derek Sollenberger	2013-02-06	1	-5/+0
\|\ \ \ \ \ \
\| * \ \ \ \ \	am 573a18cc: Merge "Fixing the build"	Svetoslav	2013-01-29	1	-0/+6
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use."	Dianne Hackborn	2013-01-18	1	-0/+6
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	am 35654b61: More work on App Ops service.	Dianne Hackborn	2013-01-16	1	-15/+19
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	am b7de2194: resolved conflicts for merge of c71c678e to master	Xavier Ducrohet	2013-01-15	1	-1/+7
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	am 72c6137a: Handle empty flag attributes, such as gravity=""	Tor Norbye	2013-01-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	am 6fb9a983: Merge "Add single crunch command to aapt."	Xavier Ducrohet	2013-01-02	4	-8/+62
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge "Update framework to support r5967 of Skia." into master-chromium	Derek Sollenberger	2012-12-19	1	-5/+0
\| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Update framework to support r5967 of Skia.	Derek Sollenberger	2012-12-12	1	-5/+0