frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 6825c478 to master	Jim Miller	2013-04-17	1	-3/+21
\|\
\| *	am 9bf7be93: Merge "Add permission check for owner-info related LockSettings....	Jim Miller	2013-04-17	1	-8/+17
\| \|\
\| \| *	Add permission check for owner-info related LockSettings.	Jim Miller	2013-04-17	1	-8/+17
* \| \|	Merge "Steady improvement to multi stack."	Craig Mautner	2013-04-17	5	-38/+117
\|\ \ \
\| * \| \|	Steady improvement to multi stack.	Craig Mautner	2013-04-17	5	-38/+117
* \| \| \|	resolved conflicts for merge of 2f6a2526 to master	Jim Miller	2013-04-17	1	-13/+53
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" int...	Jim Miller	2013-04-17	1	-13/+53
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev	Jim Miller	2013-04-17	1	-13/+53
\| \| \|\ \
\| \| \| * \|	Move owner info from Settings.Secure to LockSettings	Jim Miller	2013-04-16	1	-13/+53
* \| \| \| \|	am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council r...	Amith Yamasani	2013-04-17	1	-22/+38
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am a0042742: Merge "Modify restrictions bundle per api council recommendation...	Amith Yamasani	2013-04-17	1	-22/+38
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Modify restrictions bundle per api council recommendations" into jb-mr...	Amith Yamasani	2013-04-17	1	-22/+38
\| \| \|\ \ \
\| \| \| * \| \|	Modify restrictions bundle per api council recommendations	Amith Yamasani	2013-04-17	1	-22/+38
* \| \| \| \| \|	am 0bd7a2f2: am effb153a: Merge "Lengthen the AM timeout reading crash report...	Christopher Tate	2013-04-17	1	-6/+12
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" i...	Christopher Tate	2013-04-17	1	-6/+12
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev	Christopher Tate	2013-04-17	1	-6/+12
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Lengthen the AM timeout reading crash reports slightly	Christopher Tate	2013-04-17	1	-6/+12
\| \| \| \|/ / /
* \| \| \| \| \|	am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFA...	Daniel Sandler	2013-04-17	1	-1/+5
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." i...	Daniel Sandler	2013-04-17	1	-1/+5
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev	Daniel Sandler	2013-04-17	1	-1/+5
\| \| \|\ \ \
\| \| \| * \| \|	Treat the default sound Uri the same as DEFAULT_SOUND.	Daniel Sandler	2013-04-17	1	-1/+5
\| \| \| \|/ /
* \| \| \| \|	Merge "Incremental repairs to side by side stacks."	Craig Mautner	2013-04-17	9	-61/+121
\|\ \ \ \ \
\| * \| \| \| \|	Incremental repairs to side by side stacks.	Craig Mautner	2013-04-16	9	-61/+121
* \| \| \| \| \|	Merge "Implement stack splitting and task movement."	Craig Mautner	2013-04-17	9	-112/+296
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Implement stack splitting and task movement.	Craig Mautner	2013-04-15	9	-112/+296
* \| \| \| \| \|	am e920a298: am 53f22ad9: Merge "Monitor the firewall rules file for changes"...	Ben Gruver	2013-04-16	2	-18/+132
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev	Ben Gruver	2013-04-16	2	-18/+132
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge "Monitor the firewall rules file for changes" into jb-mr2-dev	Ben Gruver	2013-04-17	2	-18/+132
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Monitor the firewall rules file for changes	Ben Gruver	2013-04-08	2	-18/+132
* \| \| \| \| \|	Merge "softap: Set broadcast option explicitly"	Dmitry Shmidt	2013-04-16	1	-2/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	softap: Set broadcast option explicitly	Dmitry Shmidt	2013-04-16	1	-2/+4
* \| \| \| \| \| \|	am a60c8c25: am 8297e68d: Merge "BinderDied may be called after we unregister...	Svetoslav	2013-04-16	1	-7/+18
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am 8297e68d: Merge "BinderDied may be called after we unregistered the death ...	Svetoslav	2013-04-16	1	-7/+18
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Merge "BinderDied may be called after we unregistered the death recipient." i...	Svetoslav	2013-04-16	1	-7/+18
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	BinderDied may be called after we unregistered the death recipient.	Svetoslav	2013-04-15	1	-7/+18
* \| \| \| \| \| \| \|	am 464f4ea3: am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist...	Stan Chesnutt	2013-04-15	1	-7/+52
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when ...	Stan Chesnutt	2013-04-15	1	-7/+52
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-sho...	Stan Chesnutt	2013-04-16	1	-7/+52
\| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \|	Re-introduce single-shot mode, set MS Assist Mode A when in	Stan Chesnutt	2013-04-15	1	-7/+52
* \| \| \| \| \| \| \| \|	am 0a8ed3f2: am 4b6d23d7: Merge "Further reduce memory usage of notification ...	Daniel Sandler	2013-04-15	1	-1/+28
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	am 4b6d23d7: Merge "Further reduce memory usage of notification archive." int...	Daniel Sandler	2013-04-15	1	-1/+28
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Merge "Further reduce memory usage of notification archive." into jb-mr2-dev	Daniel Sandler	2013-04-16	1	-1/+28
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Further reduce memory usage of notification archive.	Daniel Sandler	2013-04-16	1	-1/+28
* \| \| \| \| \| \| \| \| \|	am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into...	Daniel Sandler	2013-04-15	1	-10/+51
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev	Daniel Sandler	2013-04-15	1	-10/+51
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Merge "Finish annotating Notification.extras." into jb-mr2-dev	Daniel Sandler	2013-04-16	1	-10/+51
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	Finish annotating Notification.extras.	Daniel Sandler	2013-04-15	1	-10/+51
* \| \| \| \| \| \| \| \| \|	am e8ae4eaf: am feedb1b0: Merge "Fix security issues with LocationManager whe...	David Christie	2013-04-15	1	-3/+45
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	am feedb1b0: Merge "Fix security issues with LocationManager where apps with ...	David Christie	2013-04-15	1	-3/+45
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / /
\| \| * \| \| \| \| \| \| \|	Merge "Fix security issues with LocationManager where apps with coarse permis...	David Christie	2013-04-15	1	-3/+45
\| \| \|\ \ \ \ \ \ \ \