frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "boot into recovery via the pre-recovery service"	Doug Zongker	2014-01-16	1	-5/+24
\|\
\| *	boot into recovery via the pre-recovery service	Doug Zongker	2014-01-16	1	-5/+24
* \|	Fix build.	Jeff Brown	2014-01-16	1	-2/+4
\|/
*	resolved conflicts for merge of 6f357d32 to master	Jeff Brown	2014-01-16	13	-780/+879
\|\
\| *	Start untangling system server early bootstrapping.	Jeff Brown	2014-01-16	13	-784/+879
* \|	am 02cc684e: Delete unused power manager functionality.	Jeff Brown	2014-01-16	1	-21/+0
\|\ \ \| \|/
\| *	Delete unused power manager functionality.	Jeff Brown	2014-01-16	1	-21/+0
* \|	Merge "Defend against malformed broadcast in NotificationManager."	John Spurlock	2014-01-16	1	-2/+2
\|\ \
\| * \|	Defend against malformed broadcast in NotificationManager.	John Spurlock	2014-01-16	1	-2/+2
* \| \|	am 593a4e6f: Fix NPE when destroyActivity occurs after detach.	Craig Mautner	2014-01-16	1	-2/+4
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Fix NPE when destroyActivity occurs after detach.	Craig Mautner	2014-01-15	1	-2/+4
* \| \|	am e9ddaa0b: Merge "Cleanup after ActivityView" into klp-modular-dev	Craig Mautner	2014-01-16	3	-56/+103
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\|
\| *	Cleanup after ActivityView	Craig Mautner	2014-01-15	3	-56/+103
* \|	Merge "Add battery power use reporting to batterystats service."	Dianne Hackborn	2014-01-16	1	-2/+2
\|\ \
\| * \|	Add battery power use reporting to batterystats service.	Dianne Hackborn	2014-01-15	1	-2/+2
* \| \|	am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev	Craig Mautner	2014-01-15	5	-44/+26
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Merge "Retain stacks even if they are empty." into klp-modular-dev	Craig Mautner	2014-01-15	5	-44/+26
\| \|\
\| \| *	Retain stacks even if they are empty.	Craig Mautner	2014-01-13	5	-45/+26
\| * \|	am 305c61a1: am 3a8a8ddd: am 8c359bf4: am c174288d: Fix issue #12031685: Stic...	Dianne Hackborn	2014-01-14	1	-19/+25
* \| \|	am 5c44c51c: Merge "Use new DisplayManager flag to show own content only." in...	Craig Mautner	2014-01-14	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "Use new DisplayManager flag to show own content only." into klp-modula...	Craig Mautner	2014-01-14	1	-2/+2
\| \|\ \
\| \| * \|	Use new DisplayManager flag to show own content only.	Craig Mautner	2014-01-13	1	-2/+2
\| \| \|/
\| * \|	am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locat...	Daniel Cashman	2014-01-13	1	-0/+5
* \| \|	am 38c65b1f: am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "Mount...	Jeff Sharkey	2014-01-13	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 6fba240b: am 6d3700b3: am 47235e8b: am 90cadb35: Merge "MountService liste...	Jeff Sharkey	2014-01-13	1	-1/+1
* \| \|	am cf6e0d68: Merge "Add display synchronously." into klp-modular-dev	Craig Mautner	2014-01-13	2	-11/+9
\|\ \ \ \| \|/ /
\| * \|	Merge "Add display synchronously." into klp-modular-dev	Craig Mautner	2014-01-13	2	-11/+9
\| \|\ \
\| \| * \|	Add display synchronously.	Craig Mautner	2014-01-12	2	-33/+17
\| \| \|/
* \| \|	am da9b87a7: am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix v...	Craig Mautner	2014-01-11	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am 5d8936b4: am 27581792: am 54f99137: am 3747768b: Merge "Fix visibility of ...	Craig Mautner	2014-01-11	1	-1/+1
* \| \|	am d7c97a79: Merge "Remove misleading warnings." into klp-modular-dev	Craig Mautner	2014-01-10	1	-9/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Remove misleading warnings." into klp-modular-dev	Craig Mautner	2014-01-10	1	-9/+0
\| \|\ \
\| \| * \|	Remove misleading warnings.	Craig Mautner	2014-01-10	1	-9/+0
\| \| \|/
* \| \|	am 93884a5b: Fix invalid stackId bug.	Craig Mautner	2014-01-10	1	-22/+8
\|\ \ \ \| \|/ /
\| * \|	Fix invalid stackId bug.	Craig Mautner	2014-01-10	1	-22/+8
\| \|/
* \|	resolved conflicts for merge of 4504de5d to master	Craig Mautner	2014-01-10	3	-22/+111
\|\ \ \| \|/
\| *	Implement ActivityView.	Craig Mautner	2014-01-10	3	-22/+109
* \|	am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-mod...	Craig Mautner	2014-01-10	1	-2/+2
\|\ \ \| \|/
\| *	Call moveHomeStack before moving any stack.	Craig Mautner	2014-01-10	1	-2/+2
* \|	am b6d9eb87: Merge "Add flag to force public virtual display to show own cont...	Jeff Brown	2014-01-09	3	-6/+19
\|\ \ \| \|/
\| *	Merge "Add flag to force public virtual display to show own content." into kl...	Jeff Brown	2014-01-09	3	-6/+19
\| \|\
\| \| *	Add flag to force public virtual display to show own content.	Jeff Brown	2014-01-07	3	-6/+19
* \| \|	Merge "Revert "Revert "Move Wifi services to a new git project"""	Vinit Deshpande	2014-01-08	17	-16237/+4
\|\ \ \
\| * \| \|	Revert "Revert "Move Wifi services to a new git project""	Vinit Deshpande	2014-01-08	17	-16237/+4
* \| \| \|	Merge "b/12068020 Make kb layouts only unique to vendor/product"	RoboErik	2014-01-08	1	-48/+84
\|\ \ \ \
\| * \| \| \|	b/12068020 Make kb layouts only unique to vendor/product	RoboErik	2014-01-07	1	-48/+84
* \| \| \| \|	resolved conflicts for merge of 88bfc6dd to master	Craig Mautner	2014-01-08	8	-174/+273
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge "Extend stack management to other displays." into klp-modular-dev	Craig Mautner	2014-01-08	8	-174/+273
\| \|\ \ \ \
\| \| * \| \| \|	Extend stack management to other displays.	Craig Mautner	2014-01-06	8	-174/+273
* \| \| \| \| \|	am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added...	Mike Lockwood	2014-01-08	2	-28/+145
\|\ \ \ \ \ \ \| \|/ / / / /