frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 78742e01 to stage-korg-master	Jean-Baptiste Queru	2010-12-07	3	-22/+37
\|\
\| *	Merge "Strings for NI position request are moved to resources"	Jean-Baptiste Queru	2010-12-07	3	-22/+38
\| \|\
\| \| *	Strings for NI position request are moved to resources	Hakan Gustavsson	2010-12-03	3	-22/+38
* \| \|	am 1d67fa5b: Merge "Changing connect and response timeout."	Jean-Baptiste Queru	2010-12-06	1	-4/+7
\|\ \ \ \| \|/ /
\| * \|	Merge "Changing connect and response timeout."	Jean-Baptiste Queru	2010-12-06	1	-4/+7
\| \|\ \
\| \| * \|	Changing connect and response timeout.	Henrik Baard	2010-12-06	1	-4/+7
* \| \| \|	am 864b1e00: Merge "NumberPicker: Set formatter local value to US."	Jean-Baptiste Queru	2010-12-06	1	-1/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "NumberPicker: Set formatter local value to US."	Jean-Baptiste Queru	2010-12-06	1	-1/+2
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	NumberPicker: Set formatter local value to US.	Chen Libao	2010-12-06	1	-1/+2
\| \| \|/
* \| \|	resolved conflicts for merge of bf1439c5 to stage-korg-master	Jean-Baptiste Queru	2010-12-02	1	-1/+2
\|\ \ \ \| \|/ /
\| * \|	Merge "Preserve flags field of event passed to injectKeyEvent()"	Jean-Baptiste Queru	2010-12-02	1	-1/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Preserve flags field of event passed to injectKeyEvent()	Mike Playle	2010-12-02	1	-1/+2
\| \|/
* \|	Merge from open-source master	Jean-Baptiste Queru	2010-12-02	1	-3/+5
\|\ \ \| \|/
\| *	Merge "Fix crash by "adb shell pm list permissions -f\|-s""	Jean-Baptiste Queru	2010-12-01	1	-3/+5
\| \|\
\| \| *	Fix crash by "adb shell pm list permissions -f\|-s"	Ali Utku Selen	2010-11-30	1	-3/+5
* \| \|	Merge from open-source master	Jean-Baptiste Queru	2010-12-02	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	Merge "Fix HTTP redirect missing statuscode 303 and 307"	Jean-Baptiste Queru	2010-12-01	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Fix HTTP redirect missing statuscode 303 and 307	Per Osbäck	2010-11-29	1	-1/+1
\| \|/
* \|	am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build ...	Trevor Johns	2010-11-24	1	-0/+2
\|\ \
\| * \	Merge "Revert "Disabling AccessibilityService sample from build system."" int...	Trevor Johns	2010-11-24	1	-0/+2
\| \|\ \
\| \| * \|	Revert "Disabling AccessibilityService sample from build system."	Trevor Johns	2010-11-24	1	-0/+2
* \| \| \|	am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerb...	Xia Wang	2010-11-24	4	-21/+197
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread	Xia Wang	2010-11-24	4	-21/+197
\| \|\ \ \
\| \| * \| \|	Add Wi-Fi tests for static IP. DO NOT MERGE	Xia Wang	2010-11-22	4	-21/+197
\| \| \|/ /
* \| \| \|	am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820	Scott Main	2010-11-24	2	-5/+23
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 3577f51d: docs: clarify <include> layout properties bug: 3227820	Scott Main	2010-11-24	2	-5/+23
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	docs: clarify <include> layout properties	Scott Main	2010-11-24	2	-5/+23
* \| \| \|	am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an ...	Jean-Baptiste Queru	2010-11-23	1	-2/+7
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge "frameworks/base: Destroy the overlay even if there is an error"	Jean-Baptiste Queru	2010-11-23	1	-2/+7
\| \|\ \ \
\| \| * \| \|	frameworks/base: Destroy the overlay even if there is an error	Naomi Luis	2010-11-22	1	-2/+7
* \| \| \| \|	am 4da48ec8: Merge "Notify the playback status to DRM agents before the playb...	Gloria Wang	2010-11-22	1	-7/+12
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Notify the playback status to DRM agents before the playback starts"	Gloria Wang	2010-11-22	1	-7/+12
\| \|\ \ \ \
\| \| * \| \| \|	Notify the playback status to DRM agents before the playback starts	Gloria Wang	2010-11-22	1	-7/+12
\| \| \|/ / /
* \| \| \| \|	am d9334934: Merge "Update of DRM Framework."	Gloria Wang	2010-11-22	23	-83/+573
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Update of DRM Framework."	Gloria Wang	2010-11-22	23	-83/+573
\| \|\ \ \ \
\| \| * \| \| \|	Update of DRM Framework.	Takeshi Aimi	2010-11-19	23	-83/+573
* \| \| \| \| \|	resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp	Jean-Baptiste Queru	2010-11-22	11	-1/+1064
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Enabling cell broadcast (SMS-CB) support in the platform."	Jean-Baptiste Queru	2010-11-22	11	-1/+1064
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Enabling cell broadcast (SMS-CB) support in the platform.	Henrik Hall	2010-11-19	11	-1/+1064
\| \| \|/ / / /
* \| \| \| \| \|	am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread	Xia Wang	2010-11-22	4	-1/+281
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "Add Wifi Tethering stress test" into gingerbread	Xia Wang	2010-11-22	4	-1/+281
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add Wifi Tethering stress test	Xia Wang	2010-11-22	4	-1/+281
* \| \| \| \| \| \|	am 8fac7c2e: change sdk version variable to 2.3 (for docs)	Scott Main	2010-11-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	change sdk version variable to 2.3 (for docs)	Scott Main	2010-11-22	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Su...	Jean-Baptiste Queru	2010-11-22	1	-0/+3
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "SearchDialog: Fix for NullpointerException while using Suggestions in ...	Jean-Baptiste Queru	2010-11-22	1	-0/+3
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| * \| \| \|	SearchDialog: Fix for NullpointerException while using Suggestions in	Deepika Sai Amuri	2010-11-22	1	-0/+3
\| \|/ / / /
* \| \| \| \|	am 805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread	Dirk Dougherty	2010-11-19	4	-3/+74
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread	Dirk Dougherty	2010-11-19	4	-3/+74
\| \|\ \ \ \
\| \| * \| \| \|	doc change: Docs for SDK Tools r8, ADT 8	Dirk Dougherty	2010-11-18	4	-3/+74