frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 198297b4: am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER p...	Joe Onorato	2010-09-29	1	-1/+1
\|\
\| *	am f01a8730: Merge "Revert "Revert "Check for the DEVICE_POWER permission in ...	Joe Onorato	2010-09-29	1	-1/+1
\| \|\
\| \| *	Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""	Joe Onorato	2010-09-29	1	-1/+1
* \| \|	am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmoun...	Kenny Root	2010-09-29	1	-13/+22
\|\ \ \ \| \|/ /
\| * \|	am 212d81a0: Merge "Move all the permissions check up for unmount" into ginge...	Kenny Root	2010-09-29	1	-13/+22
\| \|\ \ \| \| \|/
\| \| *	Merge "Move all the permissions check up for unmount" into gingerbread	Kenny Root	2010-09-29	1	-13/+22
\| \| \|\
\| \| \| *	Move all the permissions check up for unmount	Kenny Root	2010-09-29	1	-13/+22
* \| \| \|	resolved conflicts for merge of f4c3b7e9 to master	Nick Pelly	2010-09-29	2	-0/+2127
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 038cabe0: NFC integration	Nick Pelly	2010-09-28	2	-0/+2127
\| \|\ \ \ \| \| \|/ /
\| \| * \|	NFC integration	Nick Pelly	2010-09-28	2	-0/+2127
* \| \| \|	am 05e11050: am a25eabad: Merge "Revert "Check for the DEVICE_POWER permissio...	Mike Lockwood	2010-09-28	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am a25eabad: Merge "Revert "Check for the DEVICE_POWER permission in userActi...	Mike Lockwood	2010-09-28	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Revert "Check for the DEVICE_POWER permission in userActivity."	Mike Lockwood	2010-09-28	1	-1/+1
\| \| \|/
* \| \|	Wifi: Update code for new BT Apis.	Jaikumar Ganesh	2010-09-28	1	-15/+11
* \| \|	Update code for new BT APIs.	Jaikumar Ganesh	2010-09-28	1	-4/+35
* \| \|	resolved conflicts for merge of d8e8186c to master	Kenny Root	2010-09-28	1	-22/+39
\|\ \ \ \| \|/ /
\| * \|	am 05105f7a: Update OBB API to include callbacks	Kenny Root	2010-09-28	1	-22/+39
\| \|\ \ \| \| \|/
\| \| *	Update OBB API to include callbacks	Kenny Root	2010-09-28	1	-22/+39
* \| \|	am f5bdeba1: am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in use...	Joe Onorato	2010-09-28	1	-1/+1
\|\ \ \ \| \|/ /
\| * \|	am ea2cf2f9: Merge "Check for the DEVICE_POWER permission in userActivity." i...	Joe Onorato	2010-09-28	1	-1/+1
\| \|\ \ \| \| \|/
\| \| *	Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread	Joe Onorato	2010-09-28	1	-1/+1
\| \| \|\
\| \| \| *	Check for the DEVICE_POWER permission in userActivity.	Joe Onorato	2010-09-28	1	-1/+1
* \| \| \|	am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gi...	Eric Laurent	2010-09-28	1	-8/+32
\|\ \ \ \ \| \|/ / /
\| * \| \|	am aeb2c62e: Merge "Fix several audio effects problems." into gingerbread	Eric Laurent	2010-09-28	1	-8/+32
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Fix several audio effects problems.	Eric Laurent	2010-09-28	1	-8/+32
\| \| \|/
* \| \|	am b763a6dc: am 08cf57d7: Merge "Fixes to granting URI permissions - take int...	Dianne Hackborn	2010-09-28	1	-15/+61
\|\ \ \ \| \|/ /
\| * \|	am 08cf57d7: Merge "Fixes to granting URI permissions - take into account pat...	Dianne Hackborn	2010-09-28	1	-15/+61
\| \|\ \ \| \| \|/
\| \| *	Merge "Fixes to granting URI permissions - take into account path perms." int...	Dianne Hackborn	2010-09-28	1	-15/+61
\| \| \|\
\| \| \| *	Fixes to granting URI permissions - take into account path perms.	Dianne Hackborn	2010-09-28	1	-15/+61
* \| \| \|	am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release	Irfan Sheriff	2010-09-28	1	-2/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c89dd54c: Remove logging on wifilock acquire/release	Irfan Sheriff	2010-09-28	1	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Remove logging on wifilock acquire/release	Irfan Sheriff	2010-09-28	1	-2/+2
\| * \| \|	am 4fc3d2f0: DO NOT MERGE	repo sync . build/envsetup.sh lunch passion-en	2010-09-27	1	-1/+4
\| \|\ \ \ \| \| \|/ /
\| \| * \|	DO NOT MERGE	repo sync . build/envsetup.sh lunch passion-eng	2010-09-27	1	-1/+4
\| \| \|/
* \| \|	Fix build.	Hung-ying Tyan	2010-09-28	1	-10/+0
* \| \|	resolved conflicts for merge of 2a36a778 to master	Hung-ying Tyan	2010-09-28	5	-3306/+0
\|\ \ \ \| \|/ /
\| * \|	am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." in...	Hung-ying Tyan	2010-09-27	5	-3316/+0
\| \|\ \ \| \| \|/
\| \| *	Merge "Move SipService out of SystemServer to phone process." into gingerbread	Hung-ying Tyan	2010-09-27	5	-3316/+0
\| \| \|\
\| \| \| *	Move SipService out of SystemServer to phone process.	Hung-ying Tyan	2010-09-28	5	-3316/+0
* \| \| \|	am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /...	Nick Kralevich	2010-09-27	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" i...	Nick Kralevich	2010-09-27	1	-0/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread	Nick Kralevich	2010-09-27	1	-0/+1
\| \| \|\ \
\| \| \| * \|	squeeze a few more bits of randomness into /dev/random	Nick Kralevich	2010-09-27	1	-0/+1
* \| \| \| \|	resolved conflicts for merge of 191a25e1 to master	Wu-cheng Li	2010-09-27	2	-6/+16
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 83ea6389: Merge "The old overlay should be destroyed if orientation change...	Wu-cheng Li	2010-09-27	2	-6/+16
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "The old overlay should be destroyed if orientation changes." into ging...	Wu-cheng Li	2010-09-27	2	-6/+16
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	The old overlay should be destroyed if orientation changes.	Wu-cheng Li	2010-09-27	2	-6/+16
\| * \| \| \|	am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into g...	Dianne Hackborn	2010-09-27	2	-2/+34
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Allow all apps to call ContentResolver.getType()." into gingerbread	Dianne Hackborn	2010-09-27	2	-2/+34
\| \| \|\ \ \
\| \| \| * \| \|	Allow all apps to call ContentResolver.getType().	Dianne Hackborn	2010-09-26	2	-2/+34