frameworks_base.git - frameworks/base

	Commit message (Expand)	Author	Age	Files	Lines
*	am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest fo...	Eric Fischer	2010-08-16	1	-1/+1
\|\
\| *	am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="fals...	Eric Fischer	2010-08-13	1	-1/+1
\| \|\
\| \| *	Merge "Change aapt's warning message to suggest formatted="false", not "true"...	Eric Fischer	2010-08-13	1	-1/+1
\| \| \|\
\| \| \| *	Change aapt's warning message to suggest formatted="false", not "true".	Eric Fischer	2010-08-13	1	-1/+1
\| * \| \|	am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread	Ficus Kirkpatrick	2010-08-13	3	-0/+26
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Add --max-res-version flag to aapt.	Ficus Kirkpatrick	2010-08-13	3	-0/+26
\| \| \|/
* \| \|	Add --max-res-version flag to aapt.	Ficus Kirkpatrick	2010-08-13	3	-0/+26
* \| \|	am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into ging...	Kenny Root	2010-08-11	2	-0/+255
\|\ \ \ \| \|/ /
\| * \|	am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread	Kenny Root	2010-08-11	2	-0/+255
\| \|\ \ \| \| \|/
\| \| *	Initial tool for OBB manipulation	Kenny Root	2010-08-11	2	-0/+255
\| \| *	Fix the layoutlib Paint.set(Paint) method. Do not merge.	Xavier Ducrohet	2010-07-19	1	-0/+2
* \| \|	am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"	Jean-Baptiste Queru	2010-08-11	2	-2/+2
\|\ \ \ \| \|/ /
\| * \|	am e37ab632: Merge "Fix build on some linux machines"	Jean-Baptiste Queru	2010-08-11	2	-2/+2
\| \|\ \
\| \| * \|	Fix build on some linux machines	hmepas	2010-08-11	2	-2/+2
* \| \| \|	Make libhwui entirely optional.	Romain Guy	2010-08-08	1	-23/+0
* \| \| \|	am 3d02b48b: merge from open-source master	The Android Open Source Project	2010-07-19	1	-0/+2
\|\ \ \ \ \| \|/ / /
\| * \| \|	merge from open-source master	The Android Open Source Project	2010-07-19	1	-0/+2
\| \|\ \ \ \| \| \|/ / \| \| \| / \| \| \|/ \| \|/\|
\| \| *	Fix the layoutlib Paint.set(Paint) method.	Xavier Ducrohet	2010-07-16	1	-0/+2
\| \| *	am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API...	Dan Morrill	2010-06-17	1	-1/+1
\| \| \|\
\| \| * \	am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an...	Joe Onorato	2010-06-15	2	-1/+8
\| \| \|\ \
\| \| * \ \	am 5474902f: Merge "xhdpi" into froyo	Dianne Hackborn	2010-06-04	1	-0/+5
\| \| \|\ \ \
* \| \| \ \ \	am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ...	Joe Onorato	2010-07-15	1	-3/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Clean up some style in the makefiles.	Joe Onorato	2010-07-14	1	-3/+5
* \| \| \| \| \|	Fixes a few minor problems with AAPT	Steve Block	2010-06-25	7	-8/+15
* \| \| \| \| \|	am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier d...	Dan Morrill	2010-06-17	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API...	Dan Morrill	2010-06-17	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files	Dan Morrill	2010-06-15	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are pre...	Joe Onorato	2010-06-15	2	-1/+8
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an...	Joe Onorato	2010-06-15	2	-1/+8
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ...	Joe Onorato	2010-06-10	2	-1/+8
\| \| \| \|/ \| \| \|/\|
* \| \| \|	resolved conflicts for merge of 9e660c82 to master	Jeff Brown	2010-06-13	1	-1/+10
\|\ \ \ \ \| \|/ / /
\| * \| \|	Native input dispatch rewrite work in progress.	Jeff Brown	2010-06-13	1	-1/+10
* \| \| \|	am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo	Dianne Hackborn	2010-06-06	1	-0/+5
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 5474902f: Merge "xhdpi" into froyo	Dianne Hackborn	2010-06-06	1	-0/+5
\| \|\ \ \ \| \| \|/ /
\| \| * \|	xhdpi	Dianne Hackborn	2010-06-04	1	-0/+5
* \| \| \|	new API in Context. on openDatabase, new param DatabaseErrorHandler	Vasu Nori	2010-06-03	1	-0/+8
* \| \| \|	am 5095232d: am 15fe2cb7: Add error checking for translatable strings	Kenny Root	2010-06-03	3	-9/+139
\|\ \ \ \ \| \|/ / /
\| * \| \|	Add error checking for translatable strings	Kenny Root	2010-06-03	3	-9/+139
* \| \| \|	am cee6300c: am 38a410f1: am 686d9ff5: merge from open-source master	The Android Open Source Project	2010-05-10	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 686d9ff5: merge from open-source master	The Android Open Source Project	2010-05-10	1	-1/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	merge from open-source master	The Android Open Source Project	2010-05-10	1	-1/+1
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	Merge "long modifier was on the wrong argument."	Jean-Baptiste Queru	2010-05-10	1	-1/+1
\| \| \| \|\
\| \| \| \| *	long modifier was on the wrong argument.	Scott Turner	2010-01-14	1	-1/+1
\| \| \| \| *	merge from eclair	Jean-Baptiste Queru	2009-11-15	52	-823/+4890
\| \| \| \| \|\
\| \| \| \| \| *	eclair snapshot	Jean-Baptiste Queru	2009-11-13	63	-843/+4907
\| \| \| * \| \|	am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into...	Xavier Ducrohet	2010-02-12	4	-7/+17
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Add --auto-add-overlay option to aapt. DO NOT MERGE	Xavier Ducrohet	2010-02-12	4	-7/+17
* \| \| \| \| \| \|	am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backwar...	Dan Morrill	2010-05-04	1	-12/+180
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heu...	Dan Morrill	2010-05-04	1	-12/+180
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Adding the backward-compatible filtering heuristics for the new device	Dan Morrill	2010-05-04	1	-12/+180