frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Move EventHub over to using EPOLLWAKEUP when available"	Michael Wright	2013-09-27	3	-7/+28
\|\
\| *	Move EventHub over to using EPOLLWAKEUP when available	Michael Wright	2013-09-25	3	-7/+28
* \|	am a63816c1: am 4e9c7d8b: Merge "Sigh." into klp-dev	Christopher Tate	2013-09-26	1	-3/+3
\|\ \
\| * \	am 4e9c7d8b: Merge "Sigh." into klp-dev	Christopher Tate	2013-09-26	1	-3/+3
\| \|\ \
\| \| * \	Merge "Sigh." into klp-dev	Christopher Tate	2013-09-26	1	-3/+3
\| \| \|\ \
\| \| \| * \|	Sigh.	Christopher Tate	2013-09-26	1	-3/+3
* \| \| \| \|	am ef724232: am c6afd813: Merge "PackageManager#queryIntentServices breaks it...	Svetoslav Ganov	2013-09-26	1	-0/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am c6afd813: Merge "PackageManager#queryIntentServices breaks its contract." ...	Svetoslav Ganov	2013-09-26	1	-0/+4
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev	Svetoslav Ganov	2013-09-26	1	-0/+4
\| \| \|\ \ \
\| \| \| * \| \|	PackageManager#queryIntentServices breaks its contract.	Svetoslav Ganov	2013-09-26	1	-0/+4
* \| \| \| \| \|	am 946395ec: am d2534f8c: Merge "Don\'t remove restrictions files that are va...	Amith Yamasani	2013-09-26	1	-7/+17
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp...	Amith Yamasani	2013-09-26	1	-7/+17
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Don't remove restrictions files that are valid" into klp-dev	Amith Yamasani	2013-09-26	1	-7/+17
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Don't remove restrictions files that are valid	Amith Yamasani	2013-09-26	1	-7/+17
* \| \| \| \| \| \|	am 66ee877f: am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris....	Jeff Sharkey	2013-09-26	2	-20/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev	Jeff Sharkey	2013-09-26	2	-20/+9
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "Tighten flags enforcement, API to test Uris." into klp-dev	Jeff Sharkey	2013-09-26	2	-20/+9
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Tighten flags enforcement, API to test Uris.	Jeff Sharkey	2013-09-26	2	-20/+9
* \| \| \| \| \| \|	am 4609d9a9: am 5cab967b: Merge "Adding hidden APIs for observing the print j...	Svetoslav Ganov	2013-09-26	3	-0/+164
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 5cab967b: Merge "Adding hidden APIs for observing the print jobs state." i...	Svetoslav Ganov	2013-09-26	3	-0/+164
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "Adding hidden APIs for observing the print jobs state." into klp-dev	Svetoslav Ganov	2013-09-26	3	-0/+164
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Adding hidden APIs for observing the print jobs state.	Svetoslav Ganov	2013-09-25	3	-0/+164
* \| \| \| \| \| \|	am 63cff11b: am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_S...	Dianne Hackborn	2013-09-26	1	-1/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| / \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	am c222f57b: Merge "Fix issue #10919261: Don\'t clear OP_WRITE_SMS when reset...	Dianne Hackborn	2013-09-26	1	-1/+2
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Fix issue #10919261: Don't clear OP_WRITE_SMS when resetting app prefs	Dianne Hackborn	2013-09-26	1	-1/+2
\| \| \| \|/ / \| \| \|/\| \|
* \| \| \| \|	am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana kee...	Dianne Hackborn	2013-09-25	3	-27/+120
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in ...	Dianne Hackborn	2013-09-25	3	-27/+120
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" i...	Dianne Hackborn	2013-09-25	3	-27/+120
\| \| \|\ \ \
\| \| \| * \| \|	Fix issue #10903002: com.facebook.katana keeps itself in A Services	Dianne Hackborn	2013-09-25	3	-27/+120
* \| \| \| \| \|	resolved conflicts for merge of 687c6221 to master	Jeff Sharkey	2013-09-25	2	-113/+302
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am be17a614: Merge "Require that persistable Uri permissions be taken." into ...	Jeff Sharkey	2013-09-25	2	-113/+302
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Require that persistable Uri permissions be taken.	Jeff Sharkey	2013-09-25	2	-113/+302
\| \| \|/ / /
* \| \| \| \|	am 6098618d: am 044fd573: Merge "Don\'t crash when no alarms are scheduled" i...	Christopher Tate	2013-09-24	1	-3/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 044fd573: Merge "Don\'t crash when no alarms are scheduled" into klp-dev	Christopher Tate	2013-09-24	1	-3/+2
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Don't crash when no alarms are scheduled" into klp-dev	Christopher Tate	2013-09-25	1	-3/+2
\| \| \|\ \ \
\| \| \| * \| \|	Don't crash when no alarms are scheduled	Christopher Tate	2013-09-24	1	-3/+2
* \| \| \| \| \|	am f77c1eb1: am 8488f9fa: Merge "Be less aggressive when not resuming top act...	Craig Mautner	2013-09-24	1	-6/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into k...	Craig Mautner	2013-09-24	1	-6/+3
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Be less aggressive when not resuming top activity" into klp-dev	Craig Mautner	2013-09-25	1	-6/+3
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Be less aggressive when not resuming top activity	Craig Mautner	2013-09-24	1	-6/+3
* \| \| \| \| \| \|	am 9b7d1484: am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not ...	Dianne Hackborn	2013-09-24	4	-16/+39
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." int...	Dianne Hackborn	2013-09-24	4	-16/+39
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "Fix issue #10848916: "Always" button is not working." into klp-dev	Dianne Hackborn	2013-09-24	4	-16/+39
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Fix issue #10848916: "Always" button is not working.	Dianne Hackborn	2013-09-24	4	-16/+39
\| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
* \| \| \| \| \| \|	am 8d87227c: am 0ab7d4d1: Merge "Remove Rect allocation in each layout pass."...	John Spurlock	2013-09-24	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 0ab7d4d1: Merge "Remove Rect allocation in each layout pass." into klp-dev	John Spurlock	2013-09-24	1	-3/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge "Remove Rect allocation in each layout pass." into klp-dev	John Spurlock	2013-09-24	1	-3/+3
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| \| * \| \| \|	Remove Rect allocation in each layout pass.	John Spurlock	2013-09-24	1	-3/+3
* \| \| \| \| \| \|	am d454beb8: am 0d38d0b4: Merge "Multiple printer discovery session instances...	Svetoslav	2013-09-24	2	-11/+23
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am 0d38d0b4: Merge "Multiple printer discovery session instances and other bu...	Svetoslav	2013-09-24	2	-11/+23
\| \|\ \ \ \ \ \ \| \| \|/ / / / /