frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "resolved conflicts for merge of 12eaf9d5 to master"	repo sync	2010-09-02	11	-64/+72
\|\
\| *	resolved conflicts for merge of 12eaf9d5 to master	repo sync	2010-09-03	11	-64/+72
\| \|\
\| \| *	am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into ginger...	Chia-chi Yeh	2010-09-02	11	-64/+72
\| \| \|\
\| \| \| *	Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread	Chia-chi Yeh	2010-09-02	11	-64/+72
\| \| \| \|\
\| \| \| \| *	SipService: reduce the usage of javax.sdp.*.	Chia-chi Yeh	2010-09-02	11	-64/+72
* \| \| \| \|	Merge "Fixing an issue with convert... utility methods."	Dmitri Plotnikov	2010-09-02	1	-12/+12
\|\ \ \ \ \
\| * \| \| \| \|	Fixing an issue with convert... utility methods.	Dmitri Plotnikov	2010-09-02	1	-12/+12
\| \|/ / / /
* \| \| \| \|	The results now show which expected result was used.	Maksymilian Osowski	2010-09-02	5	-13/+132
\|/ / / /
* \| \| \|	Merge "Redesigned system bar and quick settings panel."	Daniel Sandler	2010-09-02	103	-253/+442
\|\ \ \ \
\| * \| \| \|	Redesigned system bar and quick settings panel.	Daniel Sandler	2010-09-02	103	-253/+442
* \| \| \| \|	Merge "MTP: try to fix sim build"	Mike Lockwood	2010-09-02	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	MTP: try to fix sim build	Mike Lockwood	2010-09-02	1	-0/+2
\| \|/ / / /
* \| \| \| \|	Merge "Shows the details when all the tests finish and fixes the orientation ...	Maksymilian Osowski	2010-09-02	3	-2/+38
\|\ \ \ \ \
\| * \| \| \| \|	Shows the details when all the tests finish and fixes the orientation issue.	Maksymilian Osowski	2010-09-02	3	-2/+38
\| \|/ / / /
* \| \| \| \|	Merge "Fixed and slightly improved crash detection mechanism."	Maksymilian Osowski	2010-09-02	2	-4/+38
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fixed and slightly improved crash detection mechanism.	Maksymilian Osowski	2010-09-02	2	-4/+38
* \| \| \| \|	Merge "Fix longpress on Menu showing IME."	Daniel Sandler	2010-09-02	2	-16/+37
\|\ \ \ \ \
\| * \| \| \| \|	Fix longpress on Menu showing IME.	Daniel Sandler	2010-09-01	2	-16/+37
* \| \| \| \| \|	am 18dfae22: am 60264b30: SipProfile: remove outgoingCallAllowed flag.	Hung-ying Tyan	2010-09-02	1	-23/+1
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 60264b30: SipProfile: remove outgoingCallAllowed flag.	Hung-ying Tyan	2010-09-02	1	-23/+1
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	SipProfile: remove outgoingCallAllowed flag.	Hung-ying Tyan	2010-09-02	1	-23/+1
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	Merge "Updated Summarizer to report tests under all 4 possible categories now."	Maksymilian Osowski	2010-09-02	2	-65/+65
\|\ \ \ \ \
\| * \| \| \| \|	Updated Summarizer to report tests under all 4 possible categories now.	Maksymilian Osowski	2010-09-02	2	-65/+65
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge "Fixed a bug when there are too many open sockets."	Maksymilian Osowski	2010-09-02	2	-6/+48
\|\ \ \ \ \
\| * \| \| \| \|	Fixed a bug when there are too many open sockets.	Maksymilian Osowski	2010-09-02	2	-6/+48
\| \|/ / / /
* \| \| \| \|	Merge "Added "run all tests in the current directory" menu option."	Maksymilian Osowski	2010-09-02	3	-12/+53
\|\ \ \ \ \
\| * \| \| \| \|	Added "run all tests in the current directory" menu option.	Maksymilian Osowski	2010-09-02	3	-12/+53
\| \|/ / / /
* \| \| \| \|	Merge "Update current.xml to fix the build"	Jason Chen	2010-09-02	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Update current.xml to fix the build	Jason Chen	2010-09-02	1	-2/+2
* \| \| \| \| \|	am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues;...	Adam Powell	2010-09-02	0	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| / / / \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior twe...	Adam Powell	2010-09-02	9	-39/+85
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gi...	Adam Powell	2010-09-02	9	-39/+85
\| \| \|\ \ \
\| \| \| * \| \|	DO NOT MERGE Overscroll continues; asset and behavior tweaks.	Adam Powell	2010-09-02	9	-39/+85
* \| \| \| \| \|	am 75823339: am a1c69e08: Fix a small bug when granting permissions through a...	Dianne Hackborn	2010-09-01	2	-3/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am a1c69e08: Fix a small bug when granting permissions through activity results.	Dianne Hackborn	2010-09-01	2	-3/+4
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Fix a small bug when granting permissions through activity results.	Dianne Hackborn	2010-09-01	2	-3/+4
* \| \| \| \| \|	am 840f0fec: am d3efa392: Clean up some permissions.	Dianne Hackborn	2010-09-01	6	-80/+13
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am d3efa392: Clean up some permissions.	Dianne Hackborn	2010-09-01	6	-80/+13
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Clean up some permissions.	Dianne Hackborn	2010-09-01	6	-80/+13
* \| \| \| \| \|	Merge "Fix 2579224: Add a separate timeout for lockscreen vs display"	Jim Miller	2010-09-01	3	-13/+59
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix 2579224: Add a separate timeout for lockscreen vs display	Jim Miller	2010-09-01	3	-13/+59
* \| \| \| \| \| \|	Merge "Revert "Changed ConnectivityService#getServiceInstance so its a single...	Joe Onorato	2010-09-01	1	-5/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Revert "Changed ConnectivityService#getServiceInstance so its a singleton."	Joe Onorato	2010-09-01	1	-5/+6
\| \|/ / / / / /
* \| \| \| \| \| \|	am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starti...	Dianne Hackborn	2010-09-01	1	-3/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| / / / / / \| \|/ / / / /
\| * \| \| \| \|	am bc5ec2f9: Merge "Improve messages when java process is starting." into gin...	Dianne Hackborn	2010-09-01	1	-3/+6
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Improve messages when java process is starting." into gingerbread	Dianne Hackborn	2010-09-01	1	-3/+6
\| \| \|\ \ \ \
\| \| \| * \| \| \|	Improve messages when java process is starting.	Dianne Hackborn	2010-09-01	1	-3/+6
* \| \| \| \| \| \|	More fixes to current.xml to reflect the state of WebSettings	Jason Chen	2010-09-01	1	-6/+6
* \| \| \| \| \| \|	am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to...	Jason Chen	2010-09-01	0	-0/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath an...	Jason Chen	2010-09-01	2	-6/+8
\| \|\ \ \ \ \ \ \| \| \|/ / / / /