frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp	Xavier Ducrohet	2011-07-20	20	-13/+1206
\|\
\| *	resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp	Xavier Ducrohet	2011-07-20	20	-13/+1206
\| \|\
\| \| *	am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"	Xavier Ducrohet	2011-07-20	20	-13/+1206
\| \| \|\
\| \| \| *	am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"	Xavier Ducrohet	2011-07-20	20	-13/+1206
\| \| \| \|\
\| \| \| \| *	Merge "Added Caching for PreProcessed PNGs"	Xavier Ducrohet	2011-07-20	20	-13/+1206
\| \| \| \| \|\
\| \| \| \| \| *	Added Caching for PreProcessed PNGs	Josiah Gaskin	2011-07-20	20	-13/+1206
\| \| \| \| \|/
* \| \| \| \|	Merge "Audio framework: support for audio pre processing"	Eric Laurent	2011-07-20	15	-251/+1048
\|\ \ \ \ \
\| * \| \| \| \|	Audio framework: support for audio pre processing	Eric Laurent	2011-07-18	15	-251/+1048
* \| \| \| \| \|	Merge "Remove unimplemented memory pool."	Jeff Brown	2011-07-20	5	-419/+239
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unimplemented memory pool.	Jeff Brown	2011-07-20	5	-419/+239
* \| \| \| \| \| \|	Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13."	Dirk Dougherty	2011-07-20	70	-0/+11514
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13.	Dirk Dougherty	2011-07-20	70	-0/+11514
* \| \| \| \| \| \| \|	am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp	Xavier Ducrohet	2011-07-20	8	-26/+62
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp	Xavier Ducrohet	2011-07-20	8	-26/+62
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ p...	Xavier Ducrohet	2011-07-20	8	-27/+63
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \|	am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"	Xavier Ducrohet	2011-07-20	8	-27/+63
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \|
\| \| \| \| * \| \| \|	Merge "Add generation of dependency file for .ap_ package"	Xavier Ducrohet	2011-07-20	8	-27/+63
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \| \| \|	Add generation of dependency file for .ap_ package	Josiah Gaskin	2011-07-18	8	-27/+63
* \| \| \| \| \| \| \| \|	Merge "Let the media recording framework release the Camera object when it is...	James Dong	2011-07-20	1	-15/+35
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Let the media recording framework release the Camera object when it is the owner	James Dong	2011-07-20	1	-15/+35
* \| \| \| \| \| \| \| \| \|	Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views."	Jim Miller	2011-07-20	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix 5056699: GridLayout should maintain static indices for "gone" views.	Jim Miller	2011-07-20	1	-2/+0
* \| \| \| \| \| \| \| \| \| \|	Merge "Appease Doclava for ReferenceQueue.remove()"	Jesse Wilson	2011-07-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Appease Doclava for ReferenceQueue.remove()	Jesse Wilson	2011-07-20	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix bug 5038368 - Rules for collapsing action views."	Adam Powell	2011-07-20	4	-0/+16
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix bug 5038368 - Rules for collapsing action views.	Adam Powell	2011-07-20	4	-0/+16
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge "Acknowledge that the platform guarantees UTF-8 and UTF-16."	Jesse Wilson	2011-07-20	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Acknowledge that the platform guarantees UTF-8 and UTF-16.	Jesse Wilson	2011-07-19	1	-2/+2
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Skip byte order mark (BOM) in JsonReader"	Jesse Wilson	2011-07-20	2	-0/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Skip byte order mark (BOM) in JsonReader	Jesse Wilson	2011-07-20	2	-0/+29
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix dancing download notifications on phones."	Daniel Sandler	2011-07-20	1	-7/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix dancing download notifications on phones.	Daniel Sandler	2011-07-20	1	-7/+13
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Updates and fixes for the social stream API."	Dave Santoro	2011-07-20	2	-33/+61
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates and fixes for the social stream API.	Dave Santoro	2011-07-20	2	-33/+61
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "waitWithTimeout() needs to check if the result is already available, l...	Costin Manolache	2011-07-20	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	waitWithTimeout() needs to check if the result is already available, like wai...	Costin Manolache	2011-07-17	1	-3/+5
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "ConnectivityService: Implement VPN callbacks to update DNS servers."	Chia-chi Yeh	2011-07-20	1	-36/+113
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ConnectivityService: Implement VPN callbacks to update DNS servers.	Chia-chi Yeh	2011-07-19	1	-36/+113
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "MediaScanner: Do separate bulk inserts for different media types"	Mike Lockwood	2011-07-20	2	-33/+49
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MediaScanner: Do separate bulk inserts for different media types	Mike Lockwood	2011-07-20	2	-33/+49
\| \| \|_\|_\|_\|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Removed READ_WRITE_ALL_VOICEMAILS permission from framework."	Debashish Chatterjee	2011-07-20	3	-18/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed READ_WRITE_ALL_VOICEMAILS permission from framework.	Debashish Chatterjee	2011-07-20	3	-18/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug #4772392 Check what needs to be done for RTL specific new attributes ...	Fabrice Di Meglio	2011-07-20	6	-68/+60
\| \|_\|_\|_\|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Fix issue 5012047: silent mode mutes music"	Eric Laurent	2011-07-20	2	-17/+69
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue 5012047: silent mode mutes music	Eric Laurent	2011-07-19	2	-17/+69
\| \| \|_\|_\|_\|_\|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "MediaPlayer: add a disconnect from ANativeWindow"	Jamie Gennis	2011-07-20	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MediaPlayer: add a disconnect from ANativeWindow	Jamie Gennis	2011-07-19	1	-0/+2
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Start default connections on startup."	Robert Greenwalt	2011-07-20	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start default connections on startup.	Robert Greenwalt	2011-07-15	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Correctly call glviewport when surface changes."	Alex Sakhartchouk	2011-07-20	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \